Changeset 983 for trunk/main/xc_utils.c

Timestamp:

2012-07-17T10:54:15+02:00 (11 months ago)

Author:

moo

Message:

kill warnings

File:

• trunk/main/xc_utils.c (modified) (7 diffs)

trunk/main/xc_utils.c

@@ -137 +137 @@
 int xc_undo_pass_two(zend_op_array *op_array TSRMLS_DC) /* {{{ */
 {
-    zend_op *opline, *end;
+    zend_op *opline, *opline_end;
 
 #ifdef ZEND_ENGINE_2_4
@@ -150 +150 @@
 
     opline = op_array->opcodes;
-    end = opline + op_array->last;
-    while (opline < end) {
+    opline_end = opline + op_array->last;
+    while (opline < opline_end) {
 #ifdef ZEND_ENGINE_2_4
         if (opline->op1_type == IS_CONST) {
@@ -198 +198 @@
 int xc_redo_pass_two(zend_op_array *op_array TSRMLS_DC) /* {{{ */
 {
-    zend_op *opline, *end;
+    zend_op *opline, *opline_end;
 #ifdef ZEND_ENGINE_2_4
     zend_literal *literal = op_array->literals;
@@ -219 +219 @@
 #ifdef ZEND_ENGINE_2_4
     if (literal) {
-        zend_literal *end = literal + op_array->last_literal;
-        while (literal < end) {
+        zend_literal *literal_end = literal + op_array->last_literal;
+        while (literal < literal_end) {
             Z_SET_ISREF(literal->constant);
             Z_SET_REFCOUNT(literal->constant, 2); /* Make sure is_ref won't be reset */
@@ -229 +229 @@
 
     opline = op_array->opcodes;
-    end = opline + op_array->last;
-    while (opline < end) {
+    opline_end = opline + op_array->last;
+    while (opline < opline_end) {
 #ifdef ZEND_ENGINE_2_4
         if (opline->op1_type == IS_CONST) {
@@ -349 +349 @@
 int xc_foreach_early_binding_class(zend_op_array *op_array, void (*callback)(zend_op *opline, int oplineno, void *data TSRMLS_DC), void *data TSRMLS_DC) /* {{{ */
 {
-    zend_op *opline, *begin, *end, *next = NULL;
+    zend_op *opline, *begin, *opline_end, *next = NULL;
 
     opline = begin = op_array->opcodes;
-    end = opline + op_array->last;
-    while (opline < end) {
+    opline_end = opline + op_array->last;
+    while (opline < opline_end) {
         switch (opline->opcode) {
 #ifdef ZEND_GOTO
@@ -377 +377 @@
 
             case ZEND_RETURN:
-                opline = end;
+                opline = opline_end;
                 break;