- improve internal array handling

[m6w6/ext-http] / php_http_std_defs.h

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index fd96018ca843a5d4f9a12008d7a2acdd8fe6529b..f85198344526459e7aa2dab1d04c9caa627a8de8 100644 (file)
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -141,72 +141,6 @@ typedef int STATUS;
 #define HTTP_PHP_INI_ENTRY_EX(entry, default, scope, updater, displayer, global) \
        STD_PHP_INI_ENTRY_EX(entry, default, scope, updater, global, zend_http_globals, http_globals, displayer)
 
 #define HTTP_PHP_INI_ENTRY_EX(entry, default, scope, updater, displayer, global) \
        STD_PHP_INI_ENTRY_EX(entry, default, scope, updater, global, zend_http_globals, http_globals, displayer)
 

-/* {{{ arrays */
-#define FOREACH_VAL(pos, array, val) FOREACH_HASH_VAL(pos, Z_ARRVAL_P(array), val)
-#define FOREACH_HASH_VAL(pos, hash, val) \
-       for (   zend_hash_internal_pointer_reset_ex(hash, &pos); \
-                       zend_hash_get_current_data_ex(hash, (void *) &val, &pos) == SUCCESS; \
-                       zend_hash_move_forward_ex(hash, &pos))
-
-#define FOREACH_KEY(pos, array, strkey, numkey) FOREACH_HASH_KEY(pos, Z_ARRVAL_P(array), strkey, numkey)
-#define FOREACH_HASH_KEY(pos, hash, strkey, numkey) \
-       for (   zend_hash_internal_pointer_reset_ex(hash, &pos); \
-                       zend_hash_get_current_key_ex(hash, &strkey, NULL, &numkey, 0, &pos) != HASH_KEY_NON_EXISTANT; \
-                       zend_hash_move_forward_ex(hash, &pos)) \
-
-#define FOREACH_KEYLEN(pos, array, strkey, keylen, numkey) FOREACH_HASH_KEYLEN(pos, Z_ARRVAL_P(array), strkey, keylen, numkey)
-#define FOREACH_HASH_KEYLEN(pos, hash, strkey, keylen, numkey) \
-       for (   zend_hash_internal_pointer_reset_ex(hash, &pos); \
-                       zend_hash_get_current_key_ex(hash, &strkey, &keylen, &numkey, 0, &pos) != HASH_KEY_NON_EXISTANT; \
-                       zend_hash_move_forward_ex(hash, &pos)) \
-
-#define FOREACH_KEYVAL(pos, array, strkey, numkey, val) FOREACH_HASH_KEYVAL(pos, Z_ARRVAL_P(array), strkey, numkey, val)
-#define FOREACH_HASH_KEYVAL(pos, hash, strkey, numkey, val) \
-       for (   zend_hash_internal_pointer_reset_ex(hash, &pos); \
-                       zend_hash_get_current_key_ex(hash, &strkey, NULL, &numkey, 0, &pos) != HASH_KEY_NON_EXISTANT && \
-                       zend_hash_get_current_data_ex(hash, (void *) &val, &pos) == SUCCESS; \
-                       zend_hash_move_forward_ex(hash, &pos))
-
-#define FOREACH_KEYLENVAL(pos, array, strkey, keylen, numkey, val) FOREACH_HASH_KEYLENVAL(pos, Z_ARRVAL_P(array), strkey, keylen, numkey, val)
-#define FOREACH_HASH_KEYLENVAL(pos, hash, strkey, keylen, numkey, val) \
-       for (   zend_hash_internal_pointer_reset_ex(hash, &pos); \
-                       zend_hash_get_current_key_ex(hash, &strkey, &keylen, &numkey, 0, &pos) != HASH_KEY_NON_EXISTANT && \
-                       zend_hash_get_current_data_ex(hash, (void *) &val, &pos) == SUCCESS; \
-                       zend_hash_move_forward_ex(hash, &pos))
-
-#define array_copy(src, dst)   zend_hash_copy(Z_ARRVAL_P(dst), Z_ARRVAL_P(src), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *))
-#define array_merge(src, dst)  zend_hash_merge(Z_ARRVAL_P(dst), Z_ARRVAL_P(src), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *), 1)
-#define array_append(src, dst) \
-       { \
-               ulong idx; \
-               uint klen; \
-               char *key = NULL; \
-               zval **data; \
-               HashPosition pos; \
-                \
-               for (   zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(src), &pos); \
-                               zend_hash_get_current_key_ex(Z_ARRVAL_P(src), &key, &klen, &idx, 0, &pos) != HASH_KEY_NON_EXISTANT && \
-                               zend_hash_get_current_data_ex(Z_ARRVAL_P(src), (void *) &data, &pos) == SUCCESS; \
-                               zend_hash_move_forward_ex(Z_ARRVAL_P(src), &pos)) \
-               { \
-                       if (key) { \
-                               zval **tmp; \
-                                \
-                               if (SUCCESS == zend_hash_find(Z_ARRVAL_P(dst), key, klen, (void *) &tmp)) { \
-                                       if (Z_TYPE_PP(tmp) != IS_ARRAY) { \
-                                               convert_to_array_ex(tmp); \
-                                       } \
-                                       ZVAL_ADDREF(*data); \
-                                       add_next_index_zval(*tmp, *data); \
-                               } else { \
-                                       ZVAL_ADDREF(*data); \
-                                       add_assoc_zval(dst, key, *data); \
-                               } \
-                               key = NULL; \
-                       } \
-               } \
-       }
-/* }}} */

 
 #define HTTP_LONG_CONSTANT(name, const) REGISTER_LONG_CONSTANT(name, const, CONST_CS | CONST_PERSISTENT)
 
 
 #define HTTP_LONG_CONSTANT(name, const) REGISTER_LONG_CONSTANT(name, const, CONST_CS | CONST_PERSISTENT)