andi Mon Oct 4 16:17:07 2004 EDT
Modified files:
/ZendEngine2 zend_API.h zend_execute_API.c
/php-src/ext/session session.c
/php-src/ext/spl spl_array.c
/php-src/ext/standard array.c basic_functions.c
Log:
- Rename delete_global_variable() to zend_delete_global_variable()
http://cvs.php.net/diff.php/ZendEngine2/zend_API.h?r1=1.191&r2=1.192&ty=u
Index: ZendEngine2/zend_API.h
diff -u ZendEngine2/zend_API.h:1.191 ZendEngine2/zend_API.h:1.192
--- ZendEngine2/zend_API.h:1.191 Mon Oct 4 15:54:34 2004
+++ ZendEngine2/zend_API.h Mon Oct 4 16:17:04 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.h,v 1.191 2004/10/04 19:54:34 andi Exp $ */
+/* $Id: zend_API.h,v 1.192 2004/10/04 20:17:04 andi Exp $ */
#ifndef ZEND_API_H
#define ZEND_API_H
@@ -333,7 +333,7 @@
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))
http://cvs.php.net/diff.php/ZendEngine2/zend_execute_API.c?r1=1.302&r2=1.303&ty=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.302 ZendEngine2/zend_execute_API.c:1.303
--- ZendEngine2/zend_execute_API.c:1.302 Mon Oct 4 15:54:34 2004
+++ ZendEngine2/zend_execute_API.c Mon Oct 4 16:17:04 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute_API.c,v 1.302 2004/10/04 19:54:34 andi Exp $ */
+/* $Id: zend_execute_API.c,v 1.303 2004/10/04 20:17:04 andi Exp $ */
#include <stdio.h>
#include <signal.h>
@@ -1343,7 +1343,7 @@
}
}
-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;
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.399&r2=1.400&ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.399 php-src/ext/session/session.c:1.400
--- php-src/ext/session/session.c:1.399 Mon Oct 4 15:54:35 2004
+++ php-src/ext/session/session.c Mon Oct 4 16:17:06 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.399 2004/10/04 19:54:35 andi Exp $ */
+/* $Id: session.c,v 1.400 2004/10/04 20:17:06 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -526,8 +526,8 @@
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 @@
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);
}
}
http://cvs.php.net/diff.php/php-src/ext/spl/spl_array.c?r1=1.51&r2=1.52&ty=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.51 php-src/ext/spl/spl_array.c:1.52
--- php-src/ext/spl/spl_array.c:1.51 Mon Oct 4 15:54:35 2004
+++ php-src/ext/spl/spl_array.c Mon Oct 4 16:17:06 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_array.c,v 1.51 2004/10/04 19:54:35 andi Exp $ */
+/* $Id: spl_array.c,v 1.52 2004/10/04 20:17:06 andi Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -279,7 +279,7 @@
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 {
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.276&r2=1.277&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.276 php-src/ext/standard/array.c:1.277
--- php-src/ext/standard/array.c:1.276 Mon Oct 4 15:54:35 2004
+++ php-src/ext/standard/array.c Mon Oct 4 16:17:06 2004
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.276 2004/10/04 19:54:35 andi Exp $ */
+/* $Id: array.c,v 1.277 2004/10/04 20:17:06 andi Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1915,7 +1915,7 @@
/* 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 @@
}
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);
}
http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.692&r2=1.693&ty=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.692
php-src/ext/standard/basic_functions.c:1.693
--- php-src/ext/standard/basic_functions.c:1.692 Mon Oct 4 15:54:35 2004
+++ php-src/ext/standard/basic_functions.c Mon Oct 4 16:17:06 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.692 2004/10/04 19:54:35 andi Exp $ */
+/* $Id: basic_functions.c,v 1.693 2004/10/04 20:17:06 andi Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -3210,7 +3210,7 @@
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
