fix some warnings

[m6w6/ext-http] / php_http_property_proxy.c

diff --git a/php_http_property_proxy.c b/php_http_property_proxy.c
index 196cccea223e23c7de161c70113c3b9135ed3793..426f3c3dd2a6f5d63d7b7575d4c2f6b4df80c594 100644 (file)
--- a/php_http_property_proxy.c
+++ b/php_http_property_proxy.c
@@ -13,7 +13,7 @@ php_http_property_proxy_t *php_http_property_proxy_init(php_http_property_proxy_
        ZVAL_OBJVAL(proxy->myself, php_http_property_proxy_object_new_ex(php_http_property_proxy_class_entry, proxy, NULL TSRMLS_CC), 0);
        Z_ADDREF_P(object);
        proxy->object = object;
-       proxy->member = php_http_zsep(IS_STRING, member);
+       proxy->member = php_http_ztyp(IS_STRING, member);
 
        return proxy;
 }
@@ -103,7 +103,7 @@ static STATUS php_http_property_proxy_object_cast(zval *object, zval *return_val
        zval *old_value, *new_value;
 
        old_value = php_http_property_proxy_object_get(object TSRMLS_CC);
-       new_value = php_http_zsep(type, old_value);
+       new_value = php_http_ztyp(type, old_value);
 
        if (old_value != new_value) {
                zval_ptr_dtor(&old_value);
@@ -126,7 +126,7 @@ static zval *php_http_property_proxy_object_read_dimension(zval *object, zval *o
                                retval = *data;
                        }
                } else {
-                       offset = php_http_zsep(IS_STRING, offset);
+                       offset = php_http_ztyp(IS_STRING, offset);
                        if (SUCCESS == zend_hash_find(Z_ARRVAL_P(property), Z_STRVAL_P(offset), Z_STRLEN_P(offset), (void *) &data)) {
                                retval = *data;
                        }
@@ -149,6 +149,7 @@ static void php_http_property_proxy_object_write_dimension(zval *object, zval *o
        switch (Z_TYPE_P(property)) {
                case IS_NULL:
                        array_init(property);
+                       /* fallthrough */
                case IS_ARRAY:
                        Z_ADDREF_P(value);
                        if (!offset) {
@@ -156,7 +157,7 @@ static void php_http_property_proxy_object_write_dimension(zval *object, zval *o
                        } else if (Z_TYPE_P(offset) == IS_LONG) {
                                add_index_zval(property, Z_LVAL_P(offset), value);
                        } else {
-                               offset = php_http_zsep(IS_STRING, offset);
+                               offset = php_http_ztyp(IS_STRING, offset);
                                add_assoc_zval_ex(property, Z_STRVAL_P(offset), Z_STRLEN_P(offset) + 1, value);
                                zval_ptr_dtor(&offset);
                        }
@@ -175,7 +176,7 @@ PHP_METHOD(HttpPropertyProxy, __construct)
 
 PHP_MINIT_FUNCTION(http_property_proxy)
 {
-       PHP_HTTP_REGISTER_CLASS(http\\object, PropertyProxy, http_property_proxy, NULL, ZEND_ACC_FINAL);
+       PHP_HTTP_REGISTER_CLASS(http\\Object, PropertyProxy, http_property_proxy, NULL, ZEND_ACC_FINAL);
        php_http_property_proxy_class_entry->create_object = php_http_property_proxy_object_new;
        memcpy(&php_http_property_proxy_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
        php_http_property_proxy_object_handlers.set = php_http_property_proxy_object_set;