Forgot to remove some now unused variables

diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index a00d23a7b24c7e12251911f695ee4ade79518582..edeade375565deab921e458b3446f2854a7be87c 100644 (file)
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -1547,9 +1547,6 @@ SPL_METHOD(Array, key)
 void spl_array_iterator_key(zval *object, zval *return_value TSRMLS_DC) /* {{{ */
 {
        spl_array_object *intern = (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
-       char *string_key;
-       uint string_length;
-       ulong num_key;
        HashTable *aht = spl_array_get_hash_table(intern, 0 TSRMLS_CC);
 
        if (spl_array_object_verify_pos(intern, aht TSRMLS_CC) == FAILURE) {

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 3188953c8e10207cff346b546f3deab01f988c4f..54077cd734b0e74fa17ee243eee0061c8ad3e430 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -927,9 +927,6 @@ PHP_FUNCTION(current)
 PHP_FUNCTION(key)
 {
        HashTable *array;
-       char *string_key;
-       uint string_length;
-       ulong num_key;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H", &array) == FAILURE) {
                return;
@@ -1183,9 +1180,6 @@ static void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior) /* {{{
                  res;                                  /* comparison result */
        HashPosition pos;                       /* hash iterator */
        zend_bool strict = 0;           /* strict comparison or not */
-       ulong num_key;
-       uint str_key_len;
-       char *string_key;
        int (*is_equal_func)(zval *, zval *, zval * TSRMLS_DC) = is_equal_function;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "za|b", &value, &array, &strict) == FAILURE) {
@@ -2418,9 +2412,6 @@ PHP_FUNCTION(array_keys)
               res,                                     /* Result of comparison */
              *new_val;                         /* New value */
        int    add_key;                         /* Flag to indicate whether a key should be added */
-       char  *string_key;                      /* String key */
-       uint   string_key_len;
-       ulong  num_key;                         /* Numeric key */
        zend_bool strict = 0;           /* do strict comparison */
        HashPosition pos;
        int (*is_equal_func)(zval *, zval *, zval * TSRMLS_DC) = is_equal_function;
@@ -2651,9 +2642,6 @@ PHP_FUNCTION(array_pad)
 PHP_FUNCTION(array_flip)
 {
        zval *array, **entry, *data;
-       char *string_key;
-       uint str_key_len;
-       ulong num_key;
        HashPosition pos;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &array) == FAILURE) {