From 11bcaedfc8cbd89220c2a82272278951ae7f1f86 Mon Sep 17 00:00:00 2001 From: Andi Gutmans Date: Mon, 4 Oct 2004 20:17:06 +0000 Subject: [PATCH] - Rename delete_global_variable() to zend_delete_global_variable() --- Zend/zend_API.h | 2 +- Zend/zend_execute_API.c | 2 +- ext/session/session.c | 6 +++--- ext/spl/spl_array.c | 2 +- ext/standard/array.c | 4 ++-- ext/standard/basic_functions.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 1466308456..f3ba9ebf9e 100644 --- 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 481d29e260..274ea4ed51 100644 --- 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 3df802c2b9..c8a94dba41 100644 --- 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 ecc1bc0a21..73ebfbf195 100755 --- 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 4ae9205df3..b346da25b2 100644 --- 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 331706ad06..1eef4d9599 100644 --- 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); -- 2.40.0