cvs: php4 /ext/standard array.c

andrei Fri Mar 16 11:51:08 2001 EDT Modified files: /php4/ext/standard array.c Log: All user callbacks should be to EG(function_table). Index: php4/ext/standard/array.c diff -u php4/ext/standard/array.c:1.103 php4/ext/standard/array.c:1.104 --- php4/ext/standard/array.c:1.103 Fri Mar 16 11:48:40 2001 +++ php4/ext/standard/array.c Fri Mar 16 11:51:08 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.103 2001/03/16 19:48:40 fmk Exp $ */ +/* $Id: array.c,v 1.104 2001/03/16 19:51:08 andrei Exp $ */ #include "php.h" #include "php_ini.h" @@ -521,7 +521,7 @@ Bucket *s; pval **args[2]; pval *retval_ptr; - CLS_FETCH(); + ELS_FETCH(); BLS_FETCH(); f = *((Bucket **) a); @@ -530,7 +530,7 @@ args[0] = (pval **) f->pData; args[1] = (pval **) s->pData; - if (call_user_function_ex(CG(function_table), NULL, *BG(user_compare_func_name), &retval_ptr, 2, args, 0, NULL)==SUCCESS + if (call_user_function_ex(EG(function_table), NULL, *BG(user_compare_func_name), &retval_ptr, 2, args, 0, NULL)==SUCCESS && retval_ptr) { long retval; @@ -609,7 +609,7 @@ pval *args[2]; pval retval; int status; - CLS_FETCH(); + ELS_FETCH(); BLS_FETCH(); args[0] = &key1; @@ -637,7 +637,7 @@ Z_TYPE(key2) = IS_LONG; } - status = call_user_function(CG(function_table), NULL, *BG(user_compare_func_name), &retval, 2, args); + status = call_user_function(EG(function_table), NULL, *BG(user_compare_func_name), &retval, 2, args); zval_dtor(&key1); zval_dtor(&key2); @@ -958,7 +958,6 @@ ulong num_key; HashPosition pos; BLS_FETCH(); - CLS_FETCH(); ELS_FETCH(); /* Allocate space for key */