From 783285e62a10ff4e1e96baac6c07ea3bd7b84d43 Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Sun, 23 Jan 2011 10:02:06 +0000 Subject: [PATCH] - local redeclaration --- ext/session/session.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ext/session/session.c b/ext/session/session.c index 583627d7ad..4031319e8d 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1914,10 +1914,10 @@ static PHP_FUNCTION(session_unset) } IF_SESSION_VARS() { - HashTable *ht; + HashTable *ht_sess_var; SEPARATE_ZVAL_IF_NOT_REF(&PS(http_session_vars)); - ht = Z_ARRVAL_P(PS(http_session_vars)); + ht_sess_var = Z_ARRVAL_P(PS(http_session_vars)); if (PG(register_globals)) { uint str_len; @@ -1925,16 +1925,16 @@ static PHP_FUNCTION(session_unset) ulong num_key; HashPosition pos; - zend_hash_internal_pointer_reset_ex(ht, &pos); + zend_hash_internal_pointer_reset_ex(ht_sess_var, &pos); - while (zend_hash_get_current_key_ex(ht, &str, &str_len, &num_key, 0, &pos) == HASH_KEY_IS_STRING) { + while (zend_hash_get_current_key_ex(ht_sess_var, &str, &str_len, &num_key, 0, &pos) == HASH_KEY_IS_STRING) { zend_delete_global_variable(str, str_len - 1 TSRMLS_CC); - zend_hash_move_forward_ex(ht, &pos); + zend_hash_move_forward_ex(ht_sess_var, &pos); } } /* Clean $_SESSION. */ - zend_hash_clean(ht); + zend_hash_clean(ht_sess_var); } } /* }}} */ -- 2.40.0