cvs: ZendEngine2 / zend_compile.c zend_execute_API.c zend_vm_def.h zend_vm_execute.h

[email protected] ("Felipe Pena")
Newsgroups php.zend-engine.cvs
Message-ID <cvsfelipe1204851063@cvsserver> 
felipe		Fri Mar  7 00:51:03 2008 UTC

  Modified files:              
    /ZendEngine2	zend_compile.c zend_execute_API.c zend_vm_def.h 
                	zend_vm_execute.h 
  Log:
  Better readability (USTR_BYTES)
felipe-20080307005103.txt (text/plain, 12.1 KB) 
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.806&r2=1.807&diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.806 ZendEngine2/zend_compile.c:1.807
--- ZendEngine2/zend_compile.c:1.806	Mon Mar  3 14:24:11 2008
+++ ZendEngine2/zend_compile.c	Fri Mar  7 00:51:02 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_compile.c,v 1.806 2008/03/03 14:24:11 robinf Exp $ */
+/* $Id: zend_compile.c,v 1.807 2008/03/07 00:51:02 felipe Exp $ */
 
 #include <zend_language_parser.h>
 #include "zend.h"
@@ -285,7 +285,7 @@
 	while (i < op_array->last_var) {
 		if (op_array->vars[i].hash_value == hash_value &&
 		    op_array->vars[i].name_len == name_len &&
-		    !memcmp(op_array->vars[i].name.v, name.v, type==IS_UNICODE?UBYTES(name_len):name_len)) {
+		    !memcmp(op_array->vars[i].name.v, name.v, USTR_BYTES(type, name_len))) {
 		  efree(name.v);
 		  return i;
 		}
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.439&r2=1.440&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.439 ZendEngine2/zend_execute_API.c:1.440
--- ZendEngine2/zend_execute_API.c:1.439	Tue Mar  4 11:44:15 2008
+++ ZendEngine2/zend_execute_API.c	Fri Mar  7 00:51:02 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute_API.c,v 1.439 2008/03/04 11:44:15 dmitry Exp $ */
+/* $Id: zend_execute_API.c,v 1.440 2008/03/07 00:51:02 felipe Exp $ */
 
 #include <stdio.h>
 #include <signal.h>
@@ -1982,7 +1982,7 @@
 				for (i = 0; i < ex->op_array->last_var; i++) {
 					if (ex->op_array->vars[i].hash_value == hash_value &&
 						ex->op_array->vars[i].name_len == name_len &&
-						!memcmp(ex->op_array->vars[i].name.v, name.v, type == IS_UNICODE ? UBYTES(name_len) : name_len)
+						!memcmp(ex->op_array->vars[i].name.v, name.v, USTR_BYTES(type, name_len))
 					) {
 						ex->CVs[i] = NULL;
 						break;
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_def.h?r1=1.218&r2=1.219&diff_format=u
Index: ZendEngine2/zend_vm_def.h
diff -u ZendEngine2/zend_vm_def.h:1.218 ZendEngine2/zend_vm_def.h:1.219
--- ZendEngine2/zend_vm_def.h:1.218	Wed Mar  5 13:35:01 2008
+++ ZendEngine2/zend_vm_def.h	Fri Mar  7 00:51:02 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_vm_def.h,v 1.218 2008/03/05 13:35:01 dmitry Exp $ */
+/* $Id: zend_vm_def.h,v 1.219 2008/03/07 00:51:02 felipe Exp $ */
 
 /* If you change this file, please regenerate the zend_vm_execute.h and
  * zend_vm_opcodes.h files by running:
@@ -3299,7 +3299,7 @@
 					for (i = 0; i < ex->op_array->last_var; i++) {
 						if (ex->op_array->vars[i].hash_value == hash_value &&
 						    ex->op_array->vars[i].name_len == Z_UNILEN_P(varname) &&
-						    !memcmp(ex->op_array->vars[i].name.v, Z_UNIVAL_P(varname).v, Z_TYPE_P(varname)==IS_UNICODE?UBYTES(Z_UNILEN_P(varname)):Z_UNILEN_P(varname))) {
+						    !memcmp(ex->op_array->vars[i].name.v, Z_UNIVAL_P(varname).v, USTR_BYTES(Z_TYPE_P(varname), Z_UNILEN_P(varname)))) {
 							ex->CVs[i] = NULL;
 							break;
 						}
@@ -3381,7 +3381,7 @@
 									for (i = 0; i < ex->op_array->last_var; i++) {
 										if (ex->op_array->vars[i].hash_value == hash_value &&
 										    ex->op_array->vars[i].name_len == offset_len &&
-										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, Z_TYPE_P(offset)==IS_UNICODE?UBYTES(offset_len):offset_len)) {
+										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, USTR_BYTES(Z_TYPE_P(offset), offset_len))) {
 											ex->CVs[i] = NULL;
 											break;
 										}
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_execute.h?r1=1.222&r2=1.223&diff_format=u
Index: ZendEngine2/zend_vm_execute.h
diff -u ZendEngine2/zend_vm_execute.h:1.222 ZendEngine2/zend_vm_execute.h:1.223
--- ZendEngine2/zend_vm_execute.h:1.222	Wed Mar  5 13:35:01 2008
+++ ZendEngine2/zend_vm_execute.h	Fri Mar  7 00:51:02 2008
@@ -1840,7 +1840,7 @@
 					for (i = 0; i < ex->op_array->last_var; i++) {
 						if (ex->op_array->vars[i].hash_value == hash_value &&
 						    ex->op_array->vars[i].name_len == Z_UNILEN_P(varname) &&
-						    !memcmp(ex->op_array->vars[i].name.v, Z_UNIVAL_P(varname).v, Z_TYPE_P(varname)==IS_UNICODE?UBYTES(Z_UNILEN_P(varname)):Z_UNILEN_P(varname))) {
+						    !memcmp(ex->op_array->vars[i].name.v, Z_UNIVAL_P(varname).v, USTR_BYTES(Z_TYPE_P(varname), Z_UNILEN_P(varname)))) {
 							ex->CVs[i] = NULL;
 							break;
 						}
@@ -5147,7 +5147,7 @@
 					for (i = 0; i < ex->op_array->last_var; i++) {
 						if (ex->op_array->vars[i].hash_value == hash_value &&
 						    ex->op_array->vars[i].name_len == Z_UNILEN_P(varname) &&
-						    !memcmp(ex->op_array->vars[i].name.v, Z_UNIVAL_P(varname).v, Z_TYPE_P(varname)==IS_UNICODE?UBYTES(Z_UNILEN_P(varname)):Z_UNILEN_P(varname))) {
+						    !memcmp(ex->op_array->vars[i].name.v, Z_UNIVAL_P(varname).v, USTR_BYTES(Z_TYPE_P(varname), Z_UNILEN_P(varname)))) {
 							ex->CVs[i] = NULL;
 							break;
 						}
@@ -8488,7 +8488,7 @@
 					for (i = 0; i < ex->op_array->last_var; i++) {
 						if (ex->op_array->vars[i].hash_value == hash_value &&
 						    ex->op_array->vars[i].name_len == Z_UNILEN_P(varname) &&
-						    !memcmp(ex->op_array->vars[i].name.v, Z_UNIVAL_P(varname).v, Z_TYPE_P(varname)==IS_UNICODE?UBYTES(Z_UNILEN_P(varname)):Z_UNILEN_P(varname))) {
+						    !memcmp(ex->op_array->vars[i].name.v, Z_UNIVAL_P(varname).v, USTR_BYTES(Z_TYPE_P(varname), Z_UNILEN_P(varname)))) {
 							ex->CVs[i] = NULL;
 							break;
 						}
@@ -10638,7 +10638,7 @@
 									for (i = 0; i < ex->op_array->last_var; i++) {
 										if (ex->op_array->vars[i].hash_value == hash_value &&
 										    ex->op_array->vars[i].name_len == offset_len &&
-										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, Z_TYPE_P(offset)==IS_UNICODE?UBYTES(offset_len):offset_len)) {
+										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, USTR_BYTES(Z_TYPE_P(offset), offset_len))) {
 											ex->CVs[i] = NULL;
 											break;
 										}
@@ -12455,7 +12455,7 @@
 									for (i = 0; i < ex->op_array->last_var; i++) {
 										if (ex->op_array->vars[i].hash_value == hash_value &&
 										    ex->op_array->vars[i].name_len == offset_len &&
-										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, Z_TYPE_P(offset)==IS_UNICODE?UBYTES(offset_len):offset_len)) {
+										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, USTR_BYTES(Z_TYPE_P(offset), offset_len))) {
 											ex->CVs[i] = NULL;
 											break;
 										}
@@ -14313,7 +14313,7 @@
 									for (i = 0; i < ex->op_array->last_var; i++) {
 										if (ex->op_array->vars[i].hash_value == hash_value &&
 										    ex->op_array->vars[i].name_len == offset_len &&
-										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, Z_TYPE_P(offset)==IS_UNICODE?UBYTES(offset_len):offset_len)) {
+										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, USTR_BYTES(Z_TYPE_P(offset), offset_len))) {
 											ex->CVs[i] = NULL;
 											break;
 										}
@@ -16776,7 +16776,7 @@
 									for (i = 0; i < ex->op_array->last_var; i++) {
 										if (ex->op_array->vars[i].hash_value == hash_value &&
 										    ex->op_array->vars[i].name_len == offset_len &&
-										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, Z_TYPE_P(offset)==IS_UNICODE?UBYTES(offset_len):offset_len)) {
+										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, USTR_BYTES(Z_TYPE_P(offset), offset_len))) {
 											ex->CVs[i] = NULL;
 											break;
 										}
@@ -18003,7 +18003,7 @@
 									for (i = 0; i < ex->op_array->last_var; i++) {
 										if (ex->op_array->vars[i].hash_value == hash_value &&
 										    ex->op_array->vars[i].name_len == offset_len &&
-										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, Z_TYPE_P(offset)==IS_UNICODE?UBYTES(offset_len):offset_len)) {
+										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, USTR_BYTES(Z_TYPE_P(offset), offset_len))) {
 											ex->CVs[i] = NULL;
 											break;
 										}
@@ -19074,7 +19074,7 @@
 									for (i = 0; i < ex->op_array->last_var; i++) {
 										if (ex->op_array->vars[i].hash_value == hash_value &&
 										    ex->op_array->vars[i].name_len == offset_len &&
-										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, Z_TYPE_P(offset)==IS_UNICODE?UBYTES(offset_len):offset_len)) {
+										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, USTR_BYTES(Z_TYPE_P(offset), offset_len))) {
 											ex->CVs[i] = NULL;
 											break;
 										}
@@ -20145,7 +20145,7 @@
 									for (i = 0; i < ex->op_array->last_var; i++) {
 										if (ex->op_array->vars[i].hash_value == hash_value &&
 										    ex->op_array->vars[i].name_len == offset_len &&
-										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, Z_TYPE_P(offset)==IS_UNICODE?UBYTES(offset_len):offset_len)) {
+										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, USTR_BYTES(Z_TYPE_P(offset), offset_len))) {
 											ex->CVs[i] = NULL;
 											break;
 										}
@@ -21485,7 +21485,7 @@
 									for (i = 0; i < ex->op_array->last_var; i++) {
 										if (ex->op_array->vars[i].hash_value == hash_value &&
 										    ex->op_array->vars[i].name_len == offset_len &&
-										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, Z_TYPE_P(offset)==IS_UNICODE?UBYTES(offset_len):offset_len)) {
+										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, USTR_BYTES(Z_TYPE_P(offset), offset_len))) {
 											ex->CVs[i] = NULL;
 											break;
 										}
@@ -22744,7 +22744,7 @@
 					for (i = 0; i < ex->op_array->last_var; i++) {
 						if (ex->op_array->vars[i].hash_value == hash_value &&
 						    ex->op_array->vars[i].name_len == Z_UNILEN_P(varname) &&
-						    !memcmp(ex->op_array->vars[i].name.v, Z_UNIVAL_P(varname).v, Z_TYPE_P(varname)==IS_UNICODE?UBYTES(Z_UNILEN_P(varname)):Z_UNILEN_P(varname))) {
+						    !memcmp(ex->op_array->vars[i].name.v, Z_UNIVAL_P(varname).v, USTR_BYTES(Z_TYPE_P(varname), Z_UNILEN_P(varname)))) {
 							ex->CVs[i] = NULL;
 							break;
 						}
@@ -24557,7 +24557,7 @@
 									for (i = 0; i < ex->op_array->last_var; i++) {
 										if (ex->op_array->vars[i].hash_value == hash_value &&
 										    ex->op_array->vars[i].name_len == offset_len &&
-										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, Z_TYPE_P(offset)==IS_UNICODE?UBYTES(offset_len):offset_len)) {
+										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, USTR_BYTES(Z_TYPE_P(offset), offset_len))) {
 											ex->CVs[i] = NULL;
 											break;
 										}
@@ -26263,7 +26263,7 @@
 									for (i = 0; i < ex->op_array->last_var; i++) {
 										if (ex->op_array->vars[i].hash_value == hash_value &&
 										    ex->op_array->vars[i].name_len == offset_len &&
-										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, Z_TYPE_P(offset)==IS_UNICODE?UBYTES(offset_len):offset_len)) {
+										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, USTR_BYTES(Z_TYPE_P(offset), offset_len))) {
 											ex->CVs[i] = NULL;
 											break;
 										}
@@ -28009,7 +28009,7 @@
 									for (i = 0; i < ex->op_array->last_var; i++) {
 										if (ex->op_array->vars[i].hash_value == hash_value &&
 										    ex->op_array->vars[i].name_len == offset_len &&
-										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, Z_TYPE_P(offset)==IS_UNICODE?UBYTES(offset_len):offset_len)) {
+										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, USTR_BYTES(Z_TYPE_P(offset), offset_len))) {
 											ex->CVs[i] = NULL;
 											break;
 										}
@@ -30259,7 +30259,7 @@
 									for (i = 0; i < ex->op_array->last_var; i++) {
 										if (ex->op_array->vars[i].hash_value == hash_value &&
 										    ex->op_array->vars[i].name_len == offset_len &&
-										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, Z_TYPE_P(offset)==IS_UNICODE?UBYTES(offset_len):offset_len)) {
+										    !memcmp(ex->op_array->vars[i].name.v, offset_key.v, USTR_BYTES(Z_TYPE_P(offset), offset_len))) {
 											ex->CVs[i] = NULL;
 											break;
 										}
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.