iliaa Fri Jan 24 11:29:40 2003 EDT
Modified files:
/php4/ext/standard array.c assert.c browscap.c html.c
Log:
zend_error -> php_error_docref.
Index: php4/ext/standard/array.c
diff -u php4/ext/standard/array.c:1.216 php4/ext/standard/array.c:1.217
--- php4/ext/standard/array.c:1.216 Tue Jan 21 09:53:16 2003
+++ php4/ext/standard/array.c Fri Jan 24 11:29:39 2003
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.216 2003/01/21 14:53:16 iliaa Exp $ */
+/* $Id: array.c,v 1.217 2003/01/24 16:29:39 iliaa Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2083,8 +2083,7 @@
zend_hash_find(dest, string_key,
string_key_len,
(void
**)&dest_entry) == SUCCESS) {
if (*src_entry == *dest_entry) {
- zend_error(E_WARNING, "%s(): recursion
detected",
-
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC,
+E_WARNING, "recursion detected");
return 0;
}
SEPARATE_ZVAL(dest_entry);
Index: php4/ext/standard/assert.c
diff -u php4/ext/standard/assert.c:1.51 php4/ext/standard/assert.c:1.52
--- php4/ext/standard/assert.c:1.51 Tue Dec 31 11:07:32 2002
+++ php4/ext/standard/assert.c Fri Jan 24 11:29:40 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: assert.c,v 1.51 2002/12/31 16:07:32 sebastian Exp $ */
+/* $Id: assert.c,v 1.52 2003/01/24 16:29:40 iliaa Exp $ */
/* {{{ includes/startup/misc */
@@ -157,8 +157,8 @@
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", myeval);
- /* zend_error() does not return in this case. */
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Failure evaluating
+code:\n%s", myeval);
+ /* php_error_docref() does not return in this case. */
}
efree(compiled_string_description);
Index: php4/ext/standard/browscap.c
diff -u php4/ext/standard/browscap.c:1.67 php4/ext/standard/browscap.c:1.68
--- php4/ext/standard/browscap.c:1.67 Sat Jan 11 18:05:19 2003
+++ php4/ext/standard/browscap.c Fri Jan 24 11:29:40 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: browscap.c,v 1.67 2003/01/11 23:05:19 moriyoshi Exp $ */
+/* $Id: browscap.c,v 1.68 2003/01/24 16:29:40 iliaa Exp $ */
#include "php.h"
#include "php_regex.h"
@@ -228,7 +228,7 @@
case 0:
if (!PG(http_globals)[TRACK_VARS_SERVER]
||
zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "HTTP_USER_AGENT",
sizeof("HTTP_USER_AGENT"), (void **) &agent_name)==FAILURE) {
- zend_error(E_WARNING, "HTTP_USER_AGENT variable is not
set, cannot determine user agent name");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+"HTTP_USER_AGENT variable is not set, cannot determine user agent name");
RETURN_FALSE;
}
break;
Index: php4/ext/standard/html.c
diff -u php4/ext/standard/html.c:1.70 php4/ext/standard/html.c:1.71
--- php4/ext/standard/html.c:1.70 Fri Jan 3 09:37:42 2003
+++ php4/ext/standard/html.c Fri Jan 24 11:29:40 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: html.c,v 1.70 2003/01/03 14:37:42 hyanantha Exp $ */
+/* $Id: html.c,v 1.71 2003/01/24 16:29:40 iliaa Exp $ */
#include "php.h"
#if PHP_WIN32
@@ -703,7 +703,7 @@
/* When we have MBCS entities in the tables above,
this will need to handle it */
if (k > 0xff) {
- zend_error(E_WARNING, "cannot yet handle MBCS
in html_entity_decode()!");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+"cannot yet handle MBCS!");
}
replacement[0] = k;
replacement[1] = '\0';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
