andrei Fri Jul 21 23:29:25 2006 UTC
Modified files:
/php-src/ext/standard array.c basic_functions.c basic_functions.h
Log:
Remove references to BG(user_compare_fnnc_name).
# Less bickering, more coding!
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.373&r2=1.374&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.373 php-src/ext/standard/array.c:1.374
--- php-src/ext/standard/array.c:1.373 Fri Jul 21 23:25:08 2006
+++ php-src/ext/standard/array.c Fri Jul 21 23:29:25 2006
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.373 2006/07/21 23:25:08 andrei Exp $ */
+/* $Id: array.c,v 1.374 2006/07/21 23:29:25 andrei Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -602,7 +602,6 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid comparison
function."); \
BG(user_compare_fci) = old_user_compare_fci; \
BG(user_compare_fci_cache) = old_user_compare_fci_cache; \
- BG(user_compare_func_name) = old_compare_func; \
RETURN_FALSE; \
} \
@@ -615,12 +614,10 @@
*/
#define PHP_ARRAY_CMP_FUNC_VARS \
- zval **old_compare_func; \
zend_fcall_info old_user_compare_fci; \
zend_fcall_info_cache old_user_compare_fci_cache \
#define PHP_ARRAY_CMP_FUNC_BACKUP() \
- old_compare_func = BG(user_compare_func_name); \
old_user_compare_fci = BG(user_compare_fci); \
old_user_compare_fci_cache = BG(user_compare_fci_cache); \
BG(user_compare_fci_cache) = empty_fcall_info_cache; \
@@ -628,7 +625,6 @@
#define PHP_ARRAY_CMP_FUNC_RESTORE() \
BG(user_compare_fci) = old_user_compare_fci; \
BG(user_compare_fci_cache) = old_user_compare_fci_cache; \
- BG(user_compare_func_name) = old_compare_func; \
/* {{{ proto bool usort(array array_arg, mixed comparator) U
@@ -3106,11 +3102,6 @@
return_value->value.ht = ht;
}
- if ((behavior & INTERSECT_NORMAL) && data_compare_type ==
INTERSECT_COMP_DATA_USER) {
- /* array_uintersect() */
- BG(user_compare_func_name) = args[arr_argc];
- }
-
/* go through the lists and look for common values */
while (*ptrs[0]) {
if ((behavior & INTERSECT_ASSOC) /* triggered also when
INTERSECT_KEY */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.794&r2=1.795&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.794
php-src/ext/standard/basic_functions.c:1.795
--- php-src/ext/standard/basic_functions.c:1.794 Thu Jul 20 23:21:32 2006
+++ php-src/ext/standard/basic_functions.c Fri Jul 21 23:29:25 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.794 2006/07/20 23:21:32 andrei Exp $ */
+/* $Id: basic_functions.c,v 1.795 2006/07/21 23:29:25 andrei Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -4080,7 +4080,6 @@
BG(strtok_string) = NULL;
BG(strtok_zval) = NULL;
BG(locale_string) = NULL;
- BG(user_compare_func_name) = NULL;
BG(array_walk_fci) = empty_fcall_info;
BG(array_walk_fci_cache) = empty_fcall_info_cache;
BG(user_compare_fci) = empty_fcall_info;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.h?r1=1.149&r2=1.150&diff_format=u
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.149
php-src/ext/standard/basic_functions.h:1.150
--- php-src/ext/standard/basic_functions.h:1.149 Thu Jul 20 23:21:32 2006
+++ php-src/ext/standard/basic_functions.h Fri Jul 21 23:29:25 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.h,v 1.149 2006/07/20 23:21:32 andrei Exp $ */
+/* $Id: basic_functions.h,v 1.150 2006/07/21 23:29:25 andrei Exp $ */
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -166,7 +166,6 @@
char str_ebuf[40];
zend_fcall_info array_walk_fci;
zend_fcall_info_cache array_walk_fci_cache;
- zval **user_compare_func_name;
zend_fcall_info user_compare_fci;
zend_fcall_info_cache user_compare_fci_cache;
zend_llist *user_tick_functions;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
