X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_querystring.c;fp=src%2Fphp_http_querystring.c;h=b1c6a662d6ec6888ca61185c56993911a6dacc8f;hp=391bccf675f0534d36f079b2bb75b892a1434f9c;hb=e3976774f27b4129cbfd7d227aaa7e177f1b735c;hpb=d943313475c4e659a15f126e855b988a602c5697

diff --git a/src/php_http_querystring.c b/src/php_http_querystring.c
index 391bccf..b1c6a66 100644
--- a/src/php_http_querystring.c
+++ b/src/php_http_querystring.c
@@ -98,7 +98,7 @@ ZEND_RESULT_CODE php_http_querystring_xlate(zval *dst, zval *src, const char *ie
 	zval *entry;
 	zend_string *xkey, *xstr;
 	php_http_arrkey_t key;
-	
+
 	ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(src), key.h, key.key, entry)
 	{
 		if (key.key) {
@@ -107,7 +107,7 @@ ZEND_RESULT_CODE php_http_querystring_xlate(zval *dst, zval *src, const char *ie
 				return FAILURE;
 			}
 		}
-		
+
 		if (Z_TYPE_P(entry) == IS_STRING) {
 			if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(Z_STRVAL_P(entry), Z_STRLEN_P(entry), &xstr, oe, ie)) {
 				if (key.key) {
@@ -123,7 +123,7 @@ ZEND_RESULT_CODE php_http_querystring_xlate(zval *dst, zval *src, const char *ie
 			}
 		} else if (Z_TYPE_P(entry) == IS_ARRAY) {
 			zval subarray;
-			
+
 			array_init(&subarray);
 			if (key.key) {
 				add_assoc_zval_ex(dst, xkey->val, xkey->len, &subarray);
@@ -137,7 +137,7 @@ ZEND_RESULT_CODE php_http_querystring_xlate(zval *dst, zval *src, const char *ie
 				return FAILURE;
 			}
 		}
-		
+
 		if (key.key) {
 			zend_string_release(xkey);
 		}
@@ -357,7 +357,7 @@ PHP_METHOD(HttpQueryString, __construct)
 {
 	zval *params = NULL;
 	zend_error_handling zeh;
-	
+
 	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|z", &params), invalid_arg, return);
 
 	zend_replace_error_handling(EH_THROW, php_http_get_exception_bad_querystring_class_entry(), &zeh);
@@ -447,7 +447,7 @@ PHP_METHOD(HttpQueryString, get)
 	zend_long type = 0;
 	zend_bool del = 0;
 	zval *ztype = NULL, *defval = NULL;
-	
+
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|szzb", &name_str, &name_len, &ztype, &defval, &del)) {
 		if (name_str && name_len) {
 			if (ztype) {
@@ -455,7 +455,7 @@ PHP_METHOD(HttpQueryString, get)
 					type = Z_LVAL_P(ztype);
 				} else if(Z_TYPE_P(ztype) == IS_STRING) {
 					switch (Z_STRVAL_P(ztype)[0]) {
-						case 'B': 
+						case 'B':
 						case 'b':	type = PHP_HTTP_QUERYSTRING_TYPE_BOOL;		break;
 						case 'L':
 						case 'l':
@@ -464,7 +464,7 @@ PHP_METHOD(HttpQueryString, get)
 						case 'd':
 						case 'D':
 						case 'F':
-						case 'f':	type = PHP_HTTP_QUERYSTRING_TYPE_FLOAT;		break;	
+						case 'f':	type = PHP_HTTP_QUERYSTRING_TYPE_FLOAT;		break;
 						case 'S':
 						case 's':	type = PHP_HTTP_QUERYSTRING_TYPE_STRING;	break;
 						case 'A':
@@ -487,11 +487,11 @@ ZEND_END_ARG_INFO();
 PHP_METHOD(HttpQueryString, set)
 {
 	zval *params;
-	
+
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "z", &params)) {
 		return;
 	}
-	
+
 	php_http_querystring_set(getThis(), params, QS_MERGE);
 	RETVAL_ZVAL(getThis(), 1, 0);
 }
@@ -505,7 +505,7 @@ PHP_METHOD(HttpQueryString, mod)
 	zend_error_handling zeh;
 
 	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "z", &params), invalid_arg, return);
-	
+
 	zend_replace_error_handling(EH_THROW, php_http_get_exception_bad_querystring_class_entry(), &zeh);
 	ZVAL_OBJ(return_value, Z_OBJ_HT_P(instance)->clone_obj(instance));
 	/* make sure we do not inherit the reference to _GET */
@@ -562,7 +562,7 @@ PHP_METHOD(HttpQueryString, xlate)
 
 	php_http_querystring_set(getThis(), &na, 0);
 	RETVAL_ZVAL(getThis(), 1, 0);
-	
+
 	zval_ptr_dtor(&na);
 }
 #endif /* HAVE_ICONV */
@@ -606,8 +606,8 @@ PHP_METHOD(HttpQueryString, offsetGet)
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S", &offset)) {
 		return;
 	}
-	
 	qa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0, &qa_tmp);
+
 	ZVAL_DEREF(qa);
 
 	if (Z_TYPE_P(qa) == IS_ARRAY) {
@@ -625,7 +625,7 @@ PHP_METHOD(HttpQueryString, offsetSet)
 {
 	zend_string *offset;
 	zval *value, param, znull;
-	
+
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "Sz", &offset, &value)) {
 		return;
 	}
@@ -653,8 +653,8 @@ PHP_METHOD(HttpQueryString, offsetExists)
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S", &offset)) {
 		return;
 	}
-	
 	qa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0, &qa_tmp);
+
 	ZVAL_DEREF(qa);
 
 	if (Z_TYPE_P(qa) == IS_ARRAY) {
@@ -672,7 +672,7 @@ PHP_METHOD(HttpQueryString, offsetUnset)
 {
 	zend_string *offset;
 	zval param, znull;
-	
+
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S", &offset)) {
 		return;
 	}