- Merge: don't hide early declaration

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 84eef66d9d0e0c9ea1aaa6992c1f5acf4acc2034..a30c2d24e65282bbc023d34c049b15bc5337a120 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -5191,31 +5191,31 @@ void zend_do_use(znode *ns_name, znode *new_name, int is_global TSRMLS_DC) /* {{
 
        if (CG(current_namespace)) {
                /* Prefix import name with current namespace name to avoid conflicts with classes */
-               char *ns_name = emalloc(Z_STRLEN_P(CG(current_namespace)) + 1 + Z_STRLEN_P(name) + 1);
+               char *c_ns_name = emalloc(Z_STRLEN_P(CG(current_namespace)) + 1 + Z_STRLEN_P(name) + 1);
 
-               zend_str_tolower_copy(ns_name, Z_STRVAL_P(CG(current_namespace)), Z_STRLEN_P(CG(current_namespace)));
-               ns_name[Z_STRLEN_P(CG(current_namespace))] = '\\';
-               memcpy(ns_name+Z_STRLEN_P(CG(current_namespace))+1, lcname, Z_STRLEN_P(name)+1);
-               if (zend_hash_exists(CG(class_table), ns_name, Z_STRLEN_P(CG(current_namespace)) + 1 + Z_STRLEN_P(name)+1)) {
+               zend_str_tolower_copy(c_ns_name, Z_STRVAL_P(CG(current_namespace)), Z_STRLEN_P(CG(current_namespace)));
+               c_ns_name[Z_STRLEN_P(CG(current_namespace))] = '\\';
+               memcpy(c_ns_name+Z_STRLEN_P(CG(current_namespace))+1, lcname, Z_STRLEN_P(name)+1);
+               if (zend_hash_exists(CG(class_table), c_ns_name, Z_STRLEN_P(CG(current_namespace)) + 1 + Z_STRLEN_P(name)+1)) {
                        char *tmp = zend_str_tolower_dup(Z_STRVAL_P(ns), Z_STRLEN_P(ns));
 
                        if (Z_STRLEN_P(ns) != Z_STRLEN_P(CG(current_namespace)) + 1 + Z_STRLEN_P(name) ||
-                               memcmp(tmp, ns_name, Z_STRLEN_P(ns))) {
+                               memcmp(tmp, c_ns_name, Z_STRLEN_P(ns))) {
                                zend_error(E_COMPILE_ERROR, "Cannot use %s as %s because the name is already in use", Z_STRVAL_P(ns), Z_STRVAL_P(name));
                        }
                        efree(tmp);
                }
-               efree(ns_name);
+               efree(c_ns_name);
        } else if (zend_hash_find(CG(class_table), lcname, Z_STRLEN_P(name)+1, (void**)&pce) == SUCCESS &&
                   (*pce)->type == ZEND_USER_CLASS &&
                   (*pce)->filename == CG(compiled_filename)) {
-               char *tmp = zend_str_tolower_dup(Z_STRVAL_P(ns), Z_STRLEN_P(ns));
+               char *c_tmp = zend_str_tolower_dup(Z_STRVAL_P(ns), Z_STRLEN_P(ns));
 
                if (Z_STRLEN_P(ns) != Z_STRLEN_P(name) ||
-                       memcmp(tmp, lcname, Z_STRLEN_P(ns))) {
+                       memcmp(c_tmp, lcname, Z_STRLEN_P(ns))) {
                        zend_error(E_COMPILE_ERROR, "Cannot use %s as %s because the name is already in use", Z_STRVAL_P(ns), Z_STRVAL_P(name));
                }
-               efree(tmp);
+               efree(c_tmp);
        }
 
        if (zend_hash_add(CG(current_import), lcname, Z_STRLEN_P(name)+1, &ns, sizeof(zval*), NULL) != SUCCESS) {