remove unused vars

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 84adfcf1004efd1aec15ed96dbde1772c2959eb6..92abfc56907444044f0ec91fda3cfbdf71e676b6 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3341,11 +3341,10 @@ void zend_do_fetch_property(znode *result, znode *object, znode *property TSRMLS
 void zend_do_halt_compiler_register(TSRMLS_D)
 {
        char *name, *cfilename;
-       char haltoff[] = ZEND_HALT_CONSTANT_NAME;
        int len, clen;
        cfilename = zend_get_compiled_filename(TSRMLS_C);
        clen = strlen(cfilename);
-       zend_mangle_property_name(&name, &len, haltoff,
+       zend_mangle_property_name(&name, &len, ZEND_HALT_CONSTANT_NAME,
                sizeof(ZEND_HALT_CONSTANT_NAME)-1, cfilename, clen, 0);
        zend_register_long_constant(name, len+1, zend_get_scanned_file_offset(TSRMLS_C), CONST_CS, 0 TSRMLS_CC);
        pefree(name, 0);

diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
index 1434b5101af260d0b1dbac37e2831ff124464028..df41c495e4d140650377aba384d4281feaf44b2e 100644 (file)
--- a/Zend/zend_constants.c
+++ b/Zend/zend_constants.c
@@ -348,7 +348,6 @@ ZEND_API int zend_u_get_constant(zend_uchar type, zstr name, uint name_len, zval
                                retval=0;
                        }
                } else {
-                       char haltoff[] = ZEND_HALT_CONSTANT_NAME;
                        if (!EG(in_execution)) {
                                retval = 0;
                        } else if (name_len == sizeof(ZEND_HALT_CONSTANT_NAME)-1 && ZEND_U_EQUAL(type, name, name_len, ZEND_HALT_CONSTANT_NAME, sizeof(ZEND_HALT_CONSTANT_NAME)-1)) {
@@ -358,7 +357,7 @@ ZEND_API int zend_u_get_constant(zend_uchar type, zstr name, uint name_len, zval
                                cfilename = zend_get_executed_filename(TSRMLS_C);
                                clen = strlen(cfilename);
                                /* check for __COMPILER_HALT_OFFSET__ */
-                               zend_mangle_property_name(&haltname.s, &len, haltoff,
+                               zend_mangle_property_name(&haltname.s, &len, ZEND_HALT_CONSTANT_NAME,
                                        sizeof(ZEND_HALT_CONSTANT_NAME) - 1, cfilename, clen, 0);
                                if (zend_u_hash_find(EG(zend_constants), IS_STRING, haltname, len+1, (void **) &c) == SUCCESS) {
                                        retval=1;
@@ -394,7 +393,6 @@ ZEND_API int zend_u_register_constant(zend_uchar type, zend_constant *c TSRMLS_D
        zstr lookup_name;
        zstr name;
        int ret = SUCCESS;
-       static char haltoff[] = ZEND_HALT_CONSTANT_NAME;
 
 #if 0
        printf("Registering constant for module %d\n", c->module_number);