- Remove \n from error messages

diff --git a/ext/com/COM.c b/ext/com/COM.c
index c1c4f130a15c7c398a3796463ab1f433925042cd..cda4ef74801ce746d84b0e5831bcdc42df4804f7 100644 (file)
--- a/ext/com/COM.c
+++ b/ext/com/COM.c
@@ -1339,7 +1339,7 @@ static int process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, int prin
 
                ret = 1;
        } 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);

diff --git a/ext/dbx/dbx.c b/ext/dbx/dbx.c
index 77403fb0a3ce0f028fae9eee7796187f295db88b..8682231e997abc7e835dcf93a2a4ecab75bc86f3 100644 (file)
--- a/ext/dbx/dbx.c
+++ b/ext/dbx/dbx.c
@@ -262,19 +262,19 @@ ZEND_FUNCTION(dbx_connect)
 
        if (Z_TYPE_PP(arguments[0]) == IS_LONG) {
                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;
                }
                module_identifier = Z_LVAL_PP(arguments[0]);
        } else {
                convert_to_string_ex(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;
                }
                module_identifier=get_module_identifier(Z_STRVAL_PP(arguments[0]));
                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;
                }
        }

diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 4c83ad8a49c4b8eea35ed93fa1cc97074a1e4c69..64c51466ef3b07c3c64b7920a64943a8c93255a4 100644 (file)
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -282,7 +282,7 @@ PHPAPI pcre* pcre_get_compiled_regex(char *regex, pcre_extra **extra, int *preg_
                                          tables);
 
        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);
                return NULL;
        }
@@ -441,7 +441,7 @@ static void php_pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global)
 
                /* Check for too many substrings condition. */  
                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;
                }
 
@@ -715,7 +715,7 @@ static int preg_do_eval(char *eval_str, int eval_str_len, char *subject,
        /* Run the code */
        if (zend_eval_string(code.c, &retval, compiled_string_description TSRMLS_CC) == FAILURE) {
                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 */
        }
        efree(compiled_string_description);
@@ -804,7 +804,7 @@ PHPAPI char *php_pcre_replace(char *regex,   int regex_len,
                
                /* Check for too many substrings condition. */
                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;
                }
 
@@ -1196,7 +1196,7 @@ PHP_FUNCTION(preg_split)
 
                /* Check for too many substrings condition. */
                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;
                }
                                

diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c
index c3ef7dd95404c3ca2713c05b8a4944a7b15ae379..075b20e69e9430e2e28eb8bd222aae2a2898df13 100644 (file)
--- a/ext/rpc/com/com_wrapper.c
+++ b/ext/rpc/com/com_wrapper.c
@@ -555,7 +555,7 @@ ZEND_API int php_COM_process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name
 
                ret = 1;
        } 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);

diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index c9612a5161fe722b0d90bf80a254244883e8757c..4dcdf580346d32adb61bd6fa7c0bd33bb9b9e4a9 100644 (file)
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -157,7 +157,7 @@ PHP_FUNCTION(assert)
                compiled_string_description = zend_make_compiled_string_description("assert code" TSRMLS_CC);
                if (zend_eval_string(myeval, &retval, compiled_string_description TSRMLS_CC) == FAILURE) {
                        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. */
                }
                efree(compiled_string_description);