Changeset 726 for branches/1.3/xcache.c

Timestamp:

04/09/2011 02:59:31 PM (2 years ago)

Author:

moo

Message:

merge from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• xcache.c (modified) (3 diffs)

branches/1.3/xcache.c

@@ -931 +931 @@
     xc_entry_data_php_t *php = (xc_entry_data_php_t *) data;
 
-    class_name = opline->op1.u.constant.value.str.val;
-    class_len  = opline->op1.u.constant.value.str.len;
+    class_name = Z_OP_CONSTANT(opline->op1).value.str.val;
+    class_len  = Z_OP_CONSTANT(opline->op1).value.str.len;
     if (zend_hash_find(CG(class_table), class_name, class_len, (void **) &cest) == FAILURE) {
         assert(0);
@@ -2437 +2437 @@
     }
 
-    if (value->type == IS_CONSTANT) {
+    switch ((Z_TYPE_P(value) & IS_CONSTANT_TYPE_MASK)) {
+    case IS_CONSTANT:
         *return_value = *value;
         zval_copy_ctor(return_value);
         return_value->type = UNISW(IS_STRING, UG(unicode) ? IS_UNICODE : IS_STRING);
-        return;
-    }
-
-    if (value->type == IS_CONSTANT_ARRAY) {
+        break;
+
+    case IS_CONSTANT_ARRAY:
         *return_value = *value;
         zval_copy_ctor(return_value);
         return_value->type = IS_ARRAY;
-        return;
-    }
-
-    RETURN_NULL();
+        break;
+
+    default:
+        RETURN_NULL();
+    }
 }
 /* }}} */
@@ -2478 +2479 @@
 }
 /* }}} */
-static function_entry xcache_functions[] = /* {{{ */
+static zend_function_entry xcache_functions[] = /* {{{ */
 {
     PHP_FE(xcache_count,             NULL)