X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_std_defs.h;h=f85198344526459e7aa2dab1d04c9caa627a8de8;hp=b4218bd556c1d87eea2861ec7ab50b487214b5f5;hb=0e0def98a4ea4463bf8c21c6f161b2b37aa8c49d;hpb=f51ba0ea2cab12b66e684a803197c0aad4d34f67

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index b4218bd..f851983 100644
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -49,6 +49,8 @@ typedef int STATUS;
 	}
 #endif
 
+#define STR_PTR(s) (s?s:"")
+
 #define INIT_ZARR(zv, ht) \
 	{ \
 		INIT_PZVAL(&(zv)); \
@@ -139,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)
 
-/* {{{ 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)
 
@@ -246,7 +182,27 @@ typedef int STATUS;
 #	define getObject(t, o) getObjectEx(t, o, getThis())
 #	define getObjectEx(t, o, v) t * o = ((t *) zend_object_store_get_object(v TSRMLS_CC))
 #	define putObject(t, o) zend_objects_store_put(o, (zend_objects_store_dtor_t) zend_objects_destroy_object, (zend_objects_free_object_storage_t) _ ##t## _free, NULL TSRMLS_CC);
+#	ifndef WONKY
+#		define freeObject(o) \
+			if (OBJ_GUARDS(o)) { \
+				zend_hash_destroy(OBJ_GUARDS(o)); \
+				FREE_HASHTABLE(OBJ_GUARDS(o)); \
+			} \
+			if (OBJ_PROP(o)) { \
+				zend_hash_destroy(OBJ_PROP(o)); \
+				FREE_HASHTABLE(OBJ_PROP(o)); \
+			} \
+			efree(o);
+#	else
+#		define freeObject(o) \
+			if (OBJ_PROP(o)) { \
+				zend_hash_destroy(OBJ_PROP(o)); \
+				FREE_HASHTABLE(OBJ_PROP(o)); \
+			} \
+			efree(o);
+#	endif
 #	define OBJ_PROP(o) (o)->zo.properties
+#	define OBJ_GUARDS(o) (o)->zo.guards
 
 #	define DCL_STATIC_PROP(a, t, n, v)		zend_declare_property_ ##t(OBJ_PROP_CE, (#n), sizeof(#n)-1, (v), (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC)
 #	define DCL_STATIC_PROP_Z(a, n, v)		zend_declare_property(OBJ_PROP_CE, (#n), sizeof(#n)-1, (v), (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC)