- initialize local zvals used as HashTable containers

[m6w6/ext-http] / http_message_object.c

diff --git a/http_message_object.c b/http_message_object.c
index a09c83b53be0e08d72fc3272ea13fda3660288c8..cd64d31a4f0bd87f788b5087736f56a6f559ef10 100644 (file)
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -48,7 +48,7 @@ HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getBody, 0);
 HTTP_BEGIN_ARGS(setBody, 0, 1)
-       HTTP_ARG_VAL(body)
+       HTTP_ARG_VAL(body, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getHeaders, 0);
@@ -190,9 +190,9 @@ static inline void _http_message_object_declare_default_properties(TSRMLS_D)
        zend_class_entry *ce = http_message_object_ce;
 
 #ifndef WONKY
-       DCL_CONST(long, "NONE", HTTP_MSG_NONE);
-       DCL_CONST(long, "REQUEST", HTTP_MSG_REQUEST);
-       DCL_CONST(long, "RESPONSE", HTTP_MSG_RESPONSE);
+       DCL_CONST(long, "TYPE_NONE", HTTP_MSG_NONE);
+       DCL_CONST(long, "TYPE_REQUEST", HTTP_MSG_REQUEST);
+       DCL_CONST(long, "TYPE_RESPONSE", HTTP_MSG_RESPONSE);
 #endif
 
        DCL_PROP(PROTECTED, long, type, HTTP_MSG_NONE);
@@ -409,7 +409,7 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
                zval array; \
                char *m_prop_name; \
                int m_prop_len; \
-               Z_ARRVAL(array) = OBJ_PROP(obj); \
+               INIT_ZARR(array, OBJ_PROP(obj)); \
                zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 1); \
                add_assoc_ ##ptype## _ex(&array, m_prop_name, sizeof(name)+4, val); \
        }
@@ -419,7 +419,7 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
                zval array; \
                char *m_prop_name; \
                int m_prop_len; \
-               Z_ARRVAL(array) = OBJ_PROP(obj); \
+               INIT_ZARR(array, OBJ_PROP(obj)); \
                zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 1); \
                add_assoc_stringl_ex(&array, m_prop_name, sizeof(name)+4, val, len, 1); \
        }
@@ -557,7 +557,7 @@ PHP_METHOD(HttpMessage, getHeaders)
                zval headers;
                getObject(http_message_object, obj);
 
-               Z_ARRVAL(headers) = &obj->message->hdrs;
+               INIT_ZARR(headers, &obj->message->hdrs);
                array_init(return_value);
                array_copy(&headers, return_value);
        }
@@ -578,7 +578,7 @@ PHP_METHOD(HttpMessage, setHeaders)
        }
 
        zend_hash_clean(&obj->message->hdrs);
-       Z_ARRVAL(old_headers) = &obj->message->hdrs;
+       INIT_ZARR(old_headers, &obj->message->hdrs);
        array_copy(new_headers, &old_headers);
 }
 /* }}} */
@@ -597,7 +597,7 @@ PHP_METHOD(HttpMessage, addHeaders)
                return;
        }
 
-       Z_ARRVAL(old_headers) = &obj->message->hdrs;
+       INIT_ZARR(old_headers, &obj->message->hdrs);
        if (append) {
                array_append(new_headers, &old_headers);
        } else {