cvs: ZendEngine2(PHP_5_1) / zend_constants.c zend_execute_API.c zend_opcode.c

From: Date: Tue, 14 Mar 2006 11:24:45 +0000
Subject: cvs: ZendEngine2(PHP_5_1) / zend_constants.c zend_execute_API.c zend_opcode.c
Groups: php.zend-engine.cvs 
Request: Send a blank email to [email protected] to get a copy of this message 
dmitry		Tue Mar 14 11:24:45 2006 UTC

  Modified files:              (Branch: PHP_5_1)
    /ZendEngine2	zend_constants.c zend_execute_API.c zend_opcode.c 
  Log:
  zend_hash_apply() doesn't use ZEND_HASH_APPLY_... macros
  
  
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_constants.c?r1=1.71.2.2&r2=1.71.2.3&diff_format=u
Index: ZendEngine2/zend_constants.c
diff -u ZendEngine2/zend_constants.c:1.71.2.2 ZendEngine2/zend_constants.c:1.71.2.3
--- ZendEngine2/zend_constants.c:1.71.2.2	Mon Mar 13 11:13:42 2006
+++ ZendEngine2/zend_constants.c	Tue Mar 14 11:24:45 2006
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_constants.c,v 1.71.2.2 2006/03/13 11:13:42 dmitry Exp $ */
+/* $Id: zend_constants.c,v 1.71.2.3 2006/03/14 11:24:45 dmitry Exp $ */
 
 #include "zend.h"
 #include "zend_constants.h"
@@ -61,7 +61,7 @@
 
 static int clean_non_persistent_constant_full(zend_constant *c TSRMLS_DC)
 {
-	return (c->flags & CONST_PERSISTENT) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE;
+	return (c->flags & CONST_PERSISTENT) ? 0 : 1;
 }
 
 
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_execute_API.c?r1=1.331.2.17&r2=1.331.2.18&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.331.2.17 ZendEngine2/zend_execute_API.c:1.331.2.18
--- ZendEngine2/zend_execute_API.c:1.331.2.17	Mon Mar 13 11:13:42 2006
+++ ZendEngine2/zend_execute_API.c	Tue Mar 14 11:24:45 2006
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute_API.c,v 1.331.2.17 2006/03/13 11:13:42 dmitry Exp $ */
+/* $Id: zend_execute_API.c,v 1.331.2.18 2006/03/14 11:24:45 dmitry Exp $ */
 
 #include <stdio.h>
 #include <signal.h>
@@ -103,7 +103,7 @@
 
 static int clean_non_persistent_function_full(zend_function *function TSRMLS_DC)
 {
-	return (function->type == ZEND_INTERNAL_FUNCTION) ? ZEND_HASH_APPLY_KEEP :
ZEND_HASH_APPLY_REMOVE;
+	return (function->type != ZEND_INTERNAL_FUNCTION);
 }
 
 
@@ -115,7 +115,7 @@
 
 static int clean_non_persistent_class_full(zend_class_entry **ce TSRMLS_DC)
 {
-	return ((*ce)->type == ZEND_INTERNAL_CLASS) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE;
+	return ((*ce)->type != ZEND_INTERNAL_CLASS);
 }
 
 
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_opcode.c?r1=1.110.2.4&r2=1.110.2.5&diff_format=u
Index: ZendEngine2/zend_opcode.c
diff -u ZendEngine2/zend_opcode.c:1.110.2.4 ZendEngine2/zend_opcode.c:1.110.2.5
--- ZendEngine2/zend_opcode.c:1.110.2.4	Mon Mar 13 11:13:42 2006
+++ ZendEngine2/zend_opcode.c	Tue Mar 14 11:24:45 2006
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_opcode.c,v 1.110.2.4 2006/03/13 11:13:42 dmitry Exp $ */
+/* $Id: zend_opcode.c,v 1.110.2.5 2006/03/14 11:24:45 dmitry Exp $ */
 
 #include <stdio.h>
 
@@ -143,7 +143,7 @@
 	if (function->type == ZEND_USER_FUNCTION) {
 		zend_cleanup_op_array_data((zend_op_array *) function);
 	}
-	return ZEND_HASH_APPLY_KEEP;
+	return 0;
 }
 
 ZEND_API int zend_cleanup_class_data(zend_class_entry **pce TSRMLS_DC)

Thread (1 message)

  • Dmitry Stogov
« previous php.zend-engine.cvs (#4724) next »