PHP 7.4: ulong->unsigned long, uint->uint32_t

[m6w6/ext-http] / src / php_http_querystring.c

diff --git a/src/php_http_querystring.c b/src/php_http_querystring.c
index 63125da627fcbc5fe0cc7a114eb3127fccab1f0b..391bccf675f0534d36f079b2bb75b892a1434f9c 100644 (file)
--- a/src/php_http_querystring.c
+++ b/src/php_http_querystring.c
@@ -63,7 +63,7 @@ static inline void php_http_querystring_str(zval *instance, zval *return_value)
        }
 }
 
-static inline void php_http_querystring_get(zval *instance, int type, char *name, uint name_len, zval *defval, zend_bool del, zval *return_value)
+static inline void php_http_querystring_get(zval *instance, int type, char *name, uint32_t name_len, zval *defval, zend_bool del, zval *return_value)
 {
        zval *arrval, qarray_tmp, *qarray = zend_read_property(php_http_querystring_class_entry, instance, ZEND_STRL("queryArray"), 0, &qarray_tmp);
 
@@ -378,21 +378,16 @@ PHP_METHOD(HttpQueryString, getGlobalInstance)
        if (Z_TYPE_P(instance) == IS_OBJECT) {
                RETVAL_ZVAL(instance, 1, 0);
        } else if ((_GET = php_http_env_get_superglobal(ZEND_STRL("_GET")))) {
-#if PHP_VERSION_ID >= 70200
                zval tmp, *qa;
 
                ZVAL_OBJ(return_value, php_http_querystring_object_new(php_http_querystring_class_entry));
 
                ZVAL_STRING(&tmp, "queryArray");
                qa = Z_OBJ_HT_P(return_value)->get_property_ptr_ptr(return_value, &tmp, BP_VAR_RW, NULL);
-               ZVAL_NEW_REF(qa, _GET);
                zval_ptr_dtor(&tmp);
-#else
-               ZVAL_OBJ(return_value, php_http_querystring_object_new(php_http_querystring_class_entry));
 
-               ZVAL_MAKE_REF(_GET);
-               zend_update_property(php_http_querystring_class_entry, return_value, ZEND_STRL("queryArray"), _GET);
-#endif
+               ZVAL_NEW_REF(_GET, _GET);
+               ZVAL_COPY(qa, _GET);
 
                zend_update_static_property(php_http_querystring_class_entry, ZEND_STRL("instance"), return_value);
        } else {