archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

- Remove \n from error messages

Browse source
This commit is contained in:
Derick Rethans 2002-11-10 21:24:54 +00:00
parent 2007517447
commit a88e5c6e8d
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/com/COM.c
View file

@ -1339,7 +1339,7 @@ static int process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, int prin
ret = 1; ret = 1;
} else { } else {
zend_error(E_WARNING, "Thats not a dispatchable interface!! type kind = %08x\n", attr->typekind); zend_error(E_WARNING, "Thats not a dispatchable interface!! type kind = %08x", attr->typekind);
} }
typeinfo->lpVtbl->ReleaseTypeAttr(typeinfo, attr); typeinfo->lpVtbl->ReleaseTypeAttr(typeinfo, attr);

6
ext/dbx/dbx.c
View file

@ -262,19 +262,19 @@ ZEND_FUNCTION(dbx_connect)
if (Z_TYPE_PP(arguments[0]) == IS_LONG) { if (Z_TYPE_PP(arguments[0]) == IS_LONG) {
if (!module_identifier_exists(Z_LVAL_PP(arguments[0]))) { if (!module_identifier_exists(Z_LVAL_PP(arguments[0]))) {
zend_error(E_WARNING, "dbx: module '%ld' not loaded or not supported.\n", Z_LVAL_PP(arguments[0])); zend_error(E_WARNING, "dbx: module '%ld' not loaded or not supported.", Z_LVAL_PP(arguments[0]));
return; return;
} }
module_identifier = Z_LVAL_PP(arguments[0]); module_identifier = Z_LVAL_PP(arguments[0]);
} else { } else {
convert_to_string_ex(arguments[0]); convert_to_string_ex(arguments[0]);
if (!module_exists(Z_STRVAL_PP(arguments[0]))) { if (!module_exists(Z_STRVAL_PP(arguments[0]))) {
zend_error(E_WARNING, "dbx: module '%s' not loaded.\n", Z_STRVAL_PP(arguments[0])); zend_error(E_WARNING, "dbx: module '%s' not loaded.", Z_STRVAL_PP(arguments[0]));
return; return;
} }
module_identifier=get_module_identifier(Z_STRVAL_PP(arguments[0])); module_identifier=get_module_identifier(Z_STRVAL_PP(arguments[0]));
if (!module_identifier) { if (!module_identifier) {
zend_error(E_WARNING, "dbx: unsupported module '%s'.\n", Z_STRVAL_PP(arguments[0])); zend_error(E_WARNING, "dbx: unsupported module '%s'.", Z_STRVAL_PP(arguments[0]));
return; return;
} }
} }

10
ext/pcre/php_pcre.c
View file

@ -282,7 +282,7 @@ PHPAPI pcre* pcre_get_compiled_regex(char *regex, pcre_extra **extra, int *preg_
tables); tables);
if (re == NULL) { if (re == NULL) {
zend_error(E_WARNING, "Compilation failed: %s at offset %d\n", error, erroffset); zend_error(E_WARNING, "Compilation failed: %s at offset %d", error, erroffset);
efree(pattern); efree(pattern);
return NULL; return NULL;
} }
@ -441,7 +441,7 @@ static void php_pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global)
/* Check for too many substrings condition. */ /* Check for too many substrings condition. */
if (count == 0) { if (count == 0) {
zend_error(E_NOTICE, "Matched, but too many substrings\n"); zend_error(E_NOTICE, "Matched, but too many substrings");
count = size_offsets/3; count = size_offsets/3;
} }
@ -715,7 +715,7 @@ static int preg_do_eval(char *eval_str, int eval_str_len, char *subject,
/* Run the code */ /* Run the code */
if (zend_eval_string(code.c, &retval, compiled_string_description TSRMLS_CC) == FAILURE) { if (zend_eval_string(code.c, &retval, compiled_string_description TSRMLS_CC) == FAILURE) {
efree(compiled_string_description); efree(compiled_string_description);
zend_error(E_ERROR, "Failed evaluating code:\n%s\n", code); zend_error(E_ERROR, "Failed evaluating code:\n%s", code);
/* zend_error() does not return in this case */ /* zend_error() does not return in this case */
} }
efree(compiled_string_description); efree(compiled_string_description);
@ -804,7 +804,7 @@ PHPAPI char *php_pcre_replace(char *regex, int regex_len,
/* Check for too many substrings condition. */ /* Check for too many substrings condition. */
if (count == 0) { if (count == 0) {
zend_error(E_NOTICE, "Matched, but too many substrings\n"); zend_error(E_NOTICE, "Matched, but too many substrings");
count = size_offsets/3; count = size_offsets/3;
} }
@ -1196,7 +1196,7 @@ PHP_FUNCTION(preg_split)
/* Check for too many substrings condition. */ /* Check for too many substrings condition. */
if (count == 0) { if (count == 0) {
zend_error(E_NOTICE, "Matched, but too many substrings\n"); zend_error(E_NOTICE, "Matched, but too many substrings");
count = size_offsets/3; count = size_offsets/3;
} }

2
ext/rpc/com/com_wrapper.c
View file

@ -555,7 +555,7 @@ ZEND_API int php_COM_process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name
ret = 1; ret = 1;
} else { } else {
zend_error(E_WARNING, "Thats not a dispatchable interface!! type kind = %08x\n", attr->typekind); zend_error(E_WARNING, "Thats not a dispatchable interface!! type kind = %08x", attr->typekind);
} }
typeinfo->lpVtbl->ReleaseTypeAttr(typeinfo, attr); typeinfo->lpVtbl->ReleaseTypeAttr(typeinfo, attr);

2
ext/standard/assert.c
View file

@ -157,7 +157,7 @@ PHP_FUNCTION(assert)
compiled_string_description = zend_make_compiled_string_description("assert code" TSRMLS_CC); compiled_string_description = zend_make_compiled_string_description("assert code" TSRMLS_CC);
if (zend_eval_string(myeval, &retval, compiled_string_description TSRMLS_CC) == FAILURE) { if (zend_eval_string(myeval, &retval, compiled_string_description TSRMLS_CC) == FAILURE) {
efree(compiled_string_description); efree(compiled_string_description);
zend_error(E_ERROR, "Failure evaluating code:\n%s\n", myeval); zend_error(E_ERROR, "Failure evaluating code:\n%s", myeval);
/* zend_error() does not return in this case. */ /* zend_error() does not return in this case. */
} }
efree(compiled_string_description); efree(compiled_string_description);