iliaa Fri Jan 24 11:24:45 2003 EDT
Modified files:
/php4/ext/crack crack.c
/php4/ext/gmp gmp.c
/php4/ext/sysvmsg sysvmsg.c
/php4/ext/standard var_unserializer.re var_unserializer.c
Log:
zend_error -> php_error_docref.
Index: php4/ext/crack/crack.c
diff -u php4/ext/crack/crack.c:1.19 php4/ext/crack/crack.c:1.20
--- php4/ext/crack/crack.c:1.19 Tue Dec 31 11:06:20 2002
+++ php4/ext/crack/crack.c Fri Jan 24 11:24:44 2003
@@ -15,7 +15,7 @@
| Authors: Alexander Feldman |
+----------------------------------------------------------------------+
*/
-/* $Id: crack.c,v 1.19 2002/12/31 16:06:20 sebastian Exp $ */
+/* $Id: crack.c,v 1.20 2003/01/24 16:24:44 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -69,11 +69,11 @@
long resource;
if (CRACKG(current_id) != -1) {
- zend_error(E_WARNING, "Can not use more than one open dictionary with
this implementation of libcrack");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can not use more than one
+open dictionary with this implementation of libcrack");
return -1;
}
if (NULL == (pwdict = PWOpen(dictpath, "r"))) {
- zend_error(E_WARNING, "Unable to open a crack dictionary");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open a crack
+dictionary");
return -1;
}
@@ -256,7 +256,7 @@
}
if (NULL == CRACKG(last_message)) {
- zend_error(E_WARNING, "No obscure checks in this session");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "No obscure checks in this
+session");
RETURN_FALSE;
}
Index: php4/ext/gmp/gmp.c
diff -u php4/ext/gmp/gmp.c:1.30 php4/ext/gmp/gmp.c:1.31
--- php4/ext/gmp/gmp.c:1.30 Tue Dec 31 11:06:41 2002
+++ php4/ext/gmp/gmp.c Fri Jan 24 11:24:44 2003
@@ -178,7 +178,7 @@
if(Z_TYPE_PP(zval) == IS_RESOURCE) { \
ZEND_FETCH_RESOURCE(gmpnumber, mpz_t *, zval, -1, GMP_RESOURCE_NAME, le_gmp);\
} else {\
- if(convert_to_gmp(&gmpnumber, zval, 0) == FAILURE) {\
+ if(convert_to_gmp(&gmpnumber, zval, 0 TSRMLS_CC) == FAILURE) {\
RETURN_FALSE;\
}\
ZEND_REGISTER_RESOURCE(NULL, gmpnumber, le_gmp);\
@@ -190,7 +190,7 @@
/* {{{ convert_to_gmp
* Convert zval to be gmp number */
-static int convert_to_gmp(mpz_t * *gmpnumber, zval **val, int base)
+static int convert_to_gmp(mpz_t * *gmpnumber, zval **val, int base TSRMLS_DC)
{
int ret = 0;
int skip_lead = 0;
@@ -224,7 +224,7 @@
}
break;
default:
- zend_error(E_WARNING,"Unable to convert variable to GMP - wrong type");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"Unable to convert variable
+to GMP - wrong type");
efree(*gmpnumber);
return FAILURE;
}
@@ -469,12 +469,12 @@
convert_to_long_ex(base_arg);
base = Z_LVAL_PP(base_arg);
if(base < 2 || base > 36) {
- zend_error(E_WARNING, "Bad base for conversion: %d (should be
between 2 and 36)", base);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad base for
+conversion: %d (should be between 2 and 36)", base);
RETURN_FALSE;
}
}
- if(convert_to_gmp(&gmpnumber, number_arg, base) == FAILURE) {
+ if(convert_to_gmp(&gmpnumber, number_arg, base TSRMLS_CC) == FAILURE) {
RETURN_FALSE;
}
@@ -531,7 +531,7 @@
}
if(base < 2 || base > 36) {
- zend_error(E_WARNING, "Bad base for conversion: %d", base);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad base for conversion:
+%d", base);
RETURN_FALSE;
}
@@ -760,7 +760,7 @@
convert_to_long_ex(exp_arg);
if(Z_LVAL_PP(exp_arg) < 0) {
- zend_error(E_WARNING,"Negative exponent not supported");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"Negative exponent not
+supported");
RETURN_FALSE;
}
Index: php4/ext/sysvmsg/sysvmsg.c
diff -u php4/ext/sysvmsg/sysvmsg.c:1.7 php4/ext/sysvmsg/sysvmsg.c:1.8
--- php4/ext/sysvmsg/sysvmsg.c:1.7 Sat Jan 18 16:31:08 2003
+++ php4/ext/sysvmsg/sysvmsg.c Fri Jan 24 11:24:45 2003
@@ -15,7 +15,7 @@
| Authors: Wez Furlong <[EMAIL PROTECTED] |
+----------------------------------------------------------------------+
*/
-/* $Id: sysvmsg.c,v 1.7 2003/01/18 21:31:08 iliaa Exp $ */
+/* $Id: sysvmsg.c,v 1.8 2003/01/24 16:24:45 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -120,7 +120,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "sysvmsg support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.7 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.8 $");
php_info_print_table_end();
}
/* }}} */
@@ -223,8 +223,7 @@
/* doesn't already exist; create it */
mq->id = msgget(key, IPC_CREAT|IPC_EXCL|perms);
if (mq->id < 0) {
- zend_error(E_WARNING, "%s: msgget() failed for key 0x%x: %s",
- get_active_function_name(TSRMLS_C), key,
strerror(errno));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed for key
+0x%x: %s", key, strerror(errno));
efree(mq);
RETURN_FALSE;
}
@@ -381,8 +380,7 @@
efree(messagebuffer);
if (result == -1) {
- zend_error(E_WARNING, "%s(): msgsnd failed: %s",
- get_active_function_name(TSRMLS_C), strerror(errno));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "msgsnd failed: %s",
+strerror(errno));
if (zerror) {
ZVAL_LONG(zerror, errno);
}
Index: php4/ext/standard/var_unserializer.re
diff -u php4/ext/standard/var_unserializer.re:1.11
php4/ext/standard/var_unserializer.re:1.12
--- php4/ext/standard/var_unserializer.re:1.11 Mon Aug 19 15:45:46 2002
+++ php4/ext/standard/var_unserializer.re Fri Jan 24 11:24:45 2003
@@ -367,12 +367,12 @@
ZVAL_STRING(arg_func_name, class_name, 1);
if (call_user_function_ex(CG(function_table), NULL, user_func,
&retval_ptr, 1, args, 0, NULL TSRMLS_CC) != SUCCESS) {
- zend_error(E_WARNING, "'unserialize_callback_func'
defined (%s) but not found", user_func->value.str.val);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "defined
+(%s) but not found", user_func->value.str.val);
incomplete_class = 1;
ce = PHP_IC_ENTRY;
} else {
if (zend_hash_find(CG(class_table), class_name, len2 +
1, (void **) &ce) != SUCCESS) {
- zend_error(E_WARNING,
"'unserialize_callback_func' (%s) hasn't defined the class it was called for",
user_func->value.str.val);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+"(%s) hasn't defined the class it was called for", user_func->value.str.val);
incomplete_class = 1;
ce = PHP_IC_ENTRY;
} else {
@@ -403,7 +403,7 @@
"}" {
/* this is the case where we have less data than planned */
- zend_error(E_NOTICE, "Unexpected end of serialized data");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unexpected end of serialized
+data");
return 0; /* not sure if it should be 0 or 1 here? */
}
Index: php4/ext/standard/var_unserializer.c
diff -u php4/ext/standard/var_unserializer.c:1.18
php4/ext/standard/var_unserializer.c:1.19
--- php4/ext/standard/var_unserializer.c:1.18 Mon Aug 19 16:02:59 2002
+++ php4/ext/standard/var_unserializer.c Fri Jan 24 11:24:45 2003
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.5 on Mon Aug 19 22:01:10 2002 */
-#line 1 "var_unserializer.re"
+/* Generated by re2c 0.5 on Fri Jan 24 11:25:29 2003 */
+#line 1 "/home/rei/PHP_CVS/php5/ext/standard/var_unserializer.re"
#include "php.h"
#include "ext/standard/php_var.h"
#include "php_incomplete_class.h"
@@ -357,7 +357,7 @@
#line 404
{
/* this is the case where we have less data than planned */
- zend_error(E_NOTICE, "Unexpected end of serialized data");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unexpected end of serialized
+data");
return 0; /* not sure if it should be 0 or 1 here? */
}
yy15: yych = *++YYCURSOR;
@@ -419,12 +419,12 @@
ZVAL_STRING(arg_func_name, class_name, 1);
if (call_user_function_ex(CG(function_table), NULL, user_func,
&retval_ptr, 1, args, 0, NULL TSRMLS_CC) != SUCCESS) {
- zend_error(E_WARNING, "'unserialize_callback_func'
defined (%s) but not found", user_func->value.str.val);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "defined
+(%s) but not found", user_func->value.str.val);
incomplete_class = 1;
ce = PHP_IC_ENTRY;
} else {
if (zend_hash_find(CG(class_table), class_name, len2 +
1, (void **) &ce) != SUCCESS) {
- zend_error(E_WARNING,
"'unserialize_callback_func' (%s) hasn't defined the class it was called for",
user_func->value.str.val);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+"(%s) hasn't defined the class it was called for", user_func->value.str.val);
incomplete_class = 1;
ce = PHP_IC_ENTRY;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
