- Rename delete_global_variable() to zend_delete_global_variable()

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 14663084563572610b9623eee216658abc2b0b6e..f3ba9ebf9e40b79b6245714c96334b404c5102c7 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -333,7 +333,7 @@ ZEND_API int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci
 ZEND_API int zend_set_hash_symbol(zval *symbol, char *name, int name_length,
                                   zend_bool is_ref, int num_symbol_tables, ...);
 
-ZEND_API int delete_global_variable(char *name, int name_len TSRMLS_DC);
+ZEND_API int zend_delete_global_variable(char *name, int name_len TSRMLS_DC);
 
 #define add_method(arg, key, method)   add_assoc_function((arg), (key), (method))
 

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 481d29e26081e49cba346b435f853e68d3fde14b..274ea4ed51c194d3ecbbb24567ae62f18609a455 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1343,7 +1343,7 @@ void zend_verify_abstract_class(zend_class_entry *ce TSRMLS_DC)
        }
 }
 
-ZEND_API int delete_global_variable(char *name, int name_len TSRMLS_DC)
+ZEND_API int zend_delete_global_variable(char *name, int name_len TSRMLS_DC)
 {
        zend_execute_data *ex;
 

diff --git a/ext/session/session.c b/ext/session/session.c
index 3df802c2b93d4da27bdc2ec21b55ca2f8e1b7fc9..c8a94dba415636c1b56abcd1b800e33b7ae5aa1c 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -526,8 +526,8 @@ static void php_session_track_init(TSRMLS_D)
        zval *session_vars = NULL;
        
        /* Unconditionally destroy existing arrays -- possible dirty data */
-       delete_global_variable("HTTP_SESSION_VARS", sizeof("HTTP_SESSION_VARS")-1 TSRMLS_CC);
-       delete_global_variable("_SESSION", sizeof("_SESSION")-1 TSRMLS_CC);
+       zend_delete_global_variable("HTTP_SESSION_VARS", sizeof("HTTP_SESSION_VARS")-1 TSRMLS_CC);
+       zend_delete_global_variable("_SESSION", sizeof("_SESSION")-1 TSRMLS_CC);
 
        MAKE_STD_ZVAL(session_vars);
        array_init(session_vars);
@@ -1679,7 +1679,7 @@ PHP_FUNCTION(session_unset)
 
                        while (zend_hash_get_current_key_ex(ht, &str, &str_len, &num_key, 
                                                0, &pos) == HASH_KEY_IS_STRING) {
-                               delete_global_variable(str, str_len-1 TSRMLS_CC);
+                               zend_delete_global_variable(str, str_len-1 TSRMLS_CC);
                                zend_hash_move_forward_ex(ht, &pos);
                        }
                }

diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index ecc1bc0a210d73d25f76bfcc3eb8ea58f8c2fb7d..73ebfbf19533d4ad8f6be979b686dddb5e45e643 100755 (executable)
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -279,7 +279,7 @@ static void spl_array_unset_dimension(zval *object, zval *offset TSRMLS_DC)
        switch(Z_TYPE_P(offset)) {
        case IS_STRING:
                if (HASH_OF(intern->array) == &EG(symbol_table)) {
-                       if (delete_global_variable(Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC)) {
+                       if (zend_delete_global_variable(Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC)) {
                                zend_error(E_NOTICE,"Undefined index:  %s", Z_STRVAL_P(offset));
                        }
                } else {

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 4ae9205df340a29f12321021f2d453c5bfcfa6bf..b346da25b2b2b4ce829703b9aa542d2230a4f490 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -1915,7 +1915,7 @@ static void _phpi_pop(INTERNAL_FUNCTION_PARAMETERS, int off_the_end)
        /* Delete the first or last value */
        zend_hash_get_current_key_ex(Z_ARRVAL_PP(stack), &key, &key_len, &index, 0, NULL);
        if (key && Z_ARRVAL_PP(stack) == &EG(symbol_table)) {
-               delete_global_variable(key, key_len-1 TSRMLS_CC);
+               zend_delete_global_variable(key, key_len-1 TSRMLS_CC);
        } else {
                zend_hash_del_key_or_index(Z_ARRVAL_PP(stack), key, key_len, index, (key) ? HASH_DEL_KEY : HASH_DEL_INDEX);
        }
@@ -2766,7 +2766,7 @@ PHP_FUNCTION(array_unique)
                        }
                        if (p->nKeyLength) {
                                if (Z_ARRVAL_P(return_value) == &EG(symbol_table)) {
-                                       delete_global_variable(p->arKey, p->nKeyLength-1 TSRMLS_CC);
+                                       zend_delete_global_variable(p->arKey, p->nKeyLength-1 TSRMLS_CC);
                                } else {
                                        zend_hash_del(Z_ARRVAL_P(return_value), p->arKey, p->nKeyLength);
                                }

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 331706ad067ae4b0ea7195be76c1175c14f240ab..1eef4d9599157e78a6413b8d19cc15660a80da73 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -3210,7 +3210,7 @@ static int copy_request_variable(void *pDest, int num_args, va_list args, zend_h
        memcpy(new_key, prefix, prefix_len);
        memcpy(new_key+prefix_len, hash_key->arKey, hash_key->nKeyLength);
 
-       delete_global_variable(new_key, new_key_len-1 TSRMLS_CC);
+       zend_delete_global_variable(new_key, new_key_len-1 TSRMLS_CC);
        ZEND_SET_SYMBOL_WITH_LENGTH(&EG(symbol_table), new_key, new_key_len, *var, (*var)->refcount+1, 0);
 
        efree(new_key);