Better readability (USTR_BYTES)

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index b97f2cd54ddcbe070a00affc6e5a1fb66e904c8b..e8ce63671fb267f872f6f0e548ed585ac4660f4d 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -285,7 +285,7 @@ static int lookup_cv(zend_op_array *op_array, zend_uchar type, zstr name, int na
        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;
                }

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index ca594031f4cba2014d54005a34e638c87e290fe1..216680ee3cc1faa1242e175c742e7f6bb21d9be8 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1982,7 +1982,7 @@ ZEND_API int zend_u_delete_global_variable(zend_uchar type, zstr name, int name_
                                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;

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 51db4a763adc0796224500fc62946d9ac4654132..414ffde0a5dc3cc6b2a6822cce407cef2ca6c5dc 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3299,7 +3299,7 @@ ZEND_VM_HANDLER(74, ZEND_UNSET_VAR, CONST|TMP|VAR|CV, ANY)
                                        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 @@ ZEND_VM_HANDLER(75, ZEND_UNSET_DIM, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
                                                                        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;
                                                                                }

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index a9bbcb7f2834980ba2e54c20efed7984424fadc3..a29cb9c139efec2dc2e7e746a72017154fec7565 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1840,7 +1840,7 @@ static int ZEND_UNSET_VAR_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                        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 @@ static int ZEND_UNSET_VAR_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                        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 @@ static int ZEND_UNSET_VAR_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                        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 @@ static int ZEND_UNSET_DIM_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                                                        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 @@ static int ZEND_UNSET_DIM_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                                                        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 @@ static int ZEND_UNSET_DIM_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                                                        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 @@ static int ZEND_UNSET_DIM_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                                                        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 @@ static int ZEND_UNSET_DIM_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                                                        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 @@ static int ZEND_UNSET_DIM_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                                                        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 @@ static int ZEND_UNSET_DIM_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                                                        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 @@ static int ZEND_UNSET_DIM_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                                                        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 @@ static int ZEND_UNSET_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                        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 @@ static int ZEND_UNSET_DIM_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                                                        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 @@ static int ZEND_UNSET_DIM_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                                                        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 @@ static int ZEND_UNSET_DIM_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                                                        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 @@ static int ZEND_UNSET_DIM_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                                                        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;
                                                                                }