derick Sun Nov 10 16:24:45 2002 EDT
Modified files:
/php4/ext/com COM.c
/php4/ext/dbx dbx.c
/php4/ext/pcre php_pcre.c
/php4/ext/rpc/com com_wrapper.c
/php4/ext/standard assert.c
Log:
- Remove \n from error messages
Index: php4/ext/com/COM.c
diff -u php4/ext/com/COM.c:1.89 php4/ext/com/COM.c:1.90
--- php4/ext/com/COM.c:1.89 Thu Oct 31 03:23:55 2002
+++ php4/ext/com/COM.c Sun Nov 10 16:24:44 2002
@@ -18,7 +18,7 @@
| Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: COM.c,v 1.89 2002/10/31 08:23:55 wez Exp $ */
+/* $Id: COM.c,v 1.90 2002/11/10 21:24:44 derick Exp $ */
/*
* This module implements support for COM components that support the IDispatch
* interface. Both local (COM) and remote (DCOM) components can be accessed.
@@ -1339,7 +1339,7 @@
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);
Index: php4/ext/dbx/dbx.c
diff -u php4/ext/dbx/dbx.c:1.41 php4/ext/dbx/dbx.c:1.42
--- php4/ext/dbx/dbx.c:1.41 Tue Oct 29 09:08:39 2002
+++ php4/ext/dbx/dbx.c Sun Nov 10 16:24:44 2002
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dbx.c,v 1.41 2002/10/29 14:08:39 mboeren Exp $ */
+/* $Id: dbx.c,v 1.42 2002/11/10 21:24:44 derick Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -262,19 +262,19 @@
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;
}
}
Index: php4/ext/pcre/php_pcre.c
diff -u php4/ext/pcre/php_pcre.c:1.131 php4/ext/pcre/php_pcre.c:1.132
--- php4/ext/pcre/php_pcre.c:1.131 Fri Nov 8 19:43:37 2002
+++ php4/ext/pcre/php_pcre.c Sun Nov 10 16:24:45 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.131 2002/11/09 00:43:37 andrei Exp $ */
+/* $Id: php_pcre.c,v 1.132 2002/11/10 21:24:45 derick Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -282,7 +282,7 @@
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 @@
/* 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 @@
/* 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 @@
/* 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 @@
/* 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;
}
Index: php4/ext/rpc/com/com_wrapper.c
diff -u php4/ext/rpc/com/com_wrapper.c:1.82 php4/ext/rpc/com/com_wrapper.c:1.83
--- php4/ext/rpc/com/com_wrapper.c:1.82 Fri Jul 19 12:18:59 2002
+++ php4/ext/rpc/com/com_wrapper.c Sun Nov 10 16:24:45 2002
@@ -18,7 +18,7 @@
| Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: com_wrapper.c,v 1.82 2002/07/19 16:18:59 phanto Exp $ */
+/* $Id: com_wrapper.c,v 1.83 2002/11/10 21:24:45 derick Exp $ */
/*
* This module implements support for COM components that support the IDispatch
* interface. Both local (COM) and remote (DCOM) components can be accessed.
@@ -555,7 +555,7 @@
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);
Index: php4/ext/standard/assert.c
diff -u php4/ext/standard/assert.c:1.49 php4/ext/standard/assert.c:1.50
--- php4/ext/standard/assert.c:1.49 Fri Aug 23 21:19:27 2002
+++ php4/ext/standard/assert.c Sun Nov 10 16:24:45 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: assert.c,v 1.49 2002/08/24 01:19:27 helly Exp $ */
+/* $Id: assert.c,v 1.50 2002/11/10 21:24:45 derick Exp $ */
/* {{{ includes/startup/misc */
@@ -157,7 +157,7 @@
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
