- inline http_querystring_modify_array(_ex) functions

diff --git a/http_querystring_api.c b/http_querystring_api.c
index a15a0db85e884a4f887ab6b0edecf108ca818a5e..45aa5acc7666a26cbe5575cbbd1312ce5fac9ebe 100644 (file)
--- a/http_querystring_api.c
+++ b/http_querystring_api.c
@@ -31,6 +31,13 @@
 extern zend_class_entry *http_querystring_object_ce;
 #endif
 
+
+#define http_querystring_modify_array_ex(q, t, k, kl, i, pe) _http_querystring_modify_array_ex((q), (t), (k), (kl), (i), (pe) TSRMLS_CC)
+static inline int _http_querystring_modify_array_ex(zval *qarray, int key_type, char *key, int keylen, ulong idx, zval *params_entry TSRMLS_DC);
+#define http_querystring_modify_array(q, p) _http_querystring_modify_array((q), (p) TSRMLS_CC)
+static inline int _http_querystring_modify_array(zval *qarray, zval *params TSRMLS_DC);
+
+
 #ifdef HAVE_ICONV
 PHP_HTTP_API int _http_querystring_xlate(zval *array, zval *param, const char *ie, const char *oe TSRMLS_DC)
 {
@@ -105,7 +112,58 @@ PHP_HTTP_API void _http_querystring_update(zval *qarray, zval *qstring TSRMLS_DC
        }
 }
 
-PHP_HTTP_API int _http_querystring_modify_array_ex(zval *qarray, int key_type, char *key, int keylen, ulong idx, zval *params_entry TSRMLS_DC)
+PHP_HTTP_API int _http_querystring_modify(zval *qarray, zval *params TSRMLS_DC)
+{
+       if (Z_TYPE_P(params) == IS_ARRAY) {
+               return http_querystring_modify_array(qarray, params);
+       } else if (Z_TYPE_P(params) == IS_OBJECT) {
+#ifdef ZEND_ENGINE_2
+               if (!instanceof_function(Z_OBJCE_P(params), http_querystring_object_ce TSRMLS_CC)) {
+#endif
+                       zval temp_array;
+                       INIT_ZARR(temp_array, HASH_OF(params));
+                       return http_querystring_modify_array(qarray, &temp_array);
+#ifdef ZEND_ENGINE_2
+               }
+               return http_querystring_modify_array(qarray, GET_PROP_EX(params, queryArray));
+#endif
+       } else {
+               int rv;
+               zval array;
+               
+               INIT_PZVAL(&array);
+               array_init(&array);
+               
+               ZVAL_ADDREF(params);
+               convert_to_string_ex(&params);
+               sapi_module.treat_data(PARSE_STRING, estrdup(Z_STRVAL_P(params)), &array TSRMLS_CC);
+               zval_ptr_dtor(&params);
+               rv = http_querystring_modify_array(qarray, &array);
+               zval_dtor(&array);
+               return rv;
+       }
+}
+
+static inline int _http_querystring_modify_array(zval *qarray, zval *params TSRMLS_DC)
+{
+       int rv = 0;
+       char *key = NULL;
+       uint keylen = 0;
+       ulong idx = 0;
+       HashPosition pos;
+       zval **params_entry = NULL;
+       
+       FOREACH_KEYLENVAL(pos, params, key, keylen, idx, params_entry) {
+               if (http_querystring_modify_array_ex(qarray, key ? HASH_KEY_IS_STRING : HASH_KEY_IS_LONG, key, keylen, idx, *params_entry)) {
+                       rv = 1;
+               }
+               key = NULL;
+       }
+       
+       return rv;
+}
+
+static inline int _http_querystring_modify_array_ex(zval *qarray, int key_type, char *key, int keylen, ulong idx, zval *params_entry TSRMLS_DC)
 {
        zval **qarray_entry;
        
@@ -143,57 +201,6 @@ PHP_HTTP_API int _http_querystring_modify_array_ex(zval *qarray, int key_type, c
        return 1;
 }
 
-PHP_HTTP_API int _http_querystring_modify_array(zval *qarray, zval *params TSRMLS_DC)
-{
-       int rv = 0;
-       char *key = NULL;
-       uint keylen = 0;
-       ulong idx = 0;
-       HashPosition pos;
-       zval **params_entry = NULL;
-       
-       FOREACH_KEYLENVAL(pos, params, key, keylen, idx, params_entry) {
-               if (http_querystring_modify_array_ex(qarray, key ? HASH_KEY_IS_STRING : HASH_KEY_IS_LONG, key, keylen, idx, *params_entry)) {
-                       rv = 1;
-               }
-               key = NULL;
-       }
-       
-       return rv;
-}
-
-PHP_HTTP_API int _http_querystring_modify(zval *qarray, zval *params TSRMLS_DC)
-{
-       if (Z_TYPE_P(params) == IS_ARRAY) {
-               return http_querystring_modify_array(qarray, params);
-       } else if (Z_TYPE_P(params) == IS_OBJECT) {
-#ifdef ZEND_ENGINE_2
-               if (!instanceof_function(Z_OBJCE_P(params), http_querystring_object_ce TSRMLS_CC)) {
-#endif
-                       zval temp_array;
-                       INIT_ZARR(temp_array, HASH_OF(params));
-                       return http_querystring_modify_array(qarray, &temp_array);
-#ifdef ZEND_ENGINE_2
-               }
-               return http_querystring_modify_array(qarray, GET_PROP_EX(params, queryArray));
-#endif
-       } else {
-               int rv;
-               zval array;
-               
-               INIT_PZVAL(&array);
-               array_init(&array);
-               
-               ZVAL_ADDREF(params);
-               convert_to_string_ex(&params);
-               sapi_module.treat_data(PARSE_STRING, estrdup(Z_STRVAL_P(params)), &array TSRMLS_CC);
-               zval_ptr_dtor(&params);
-               rv = http_querystring_modify_array(qarray, &array);
-               zval_dtor(&array);
-               return rv;
-       }
-}
-
 /*
  * Local variables:
  * tab-width: 4

diff --git a/php_http_querystring_api.h b/php_http_querystring_api.h
index 05bcbcbe14ceba32f9abd4d943051b2c08541dec..ed869207429515a11d855f9b7d2e88794f5563cd 100644 (file)
--- a/php_http_querystring_api.h
+++ b/php_http_querystring_api.h
@@ -23,12 +23,6 @@ PHP_HTTP_API int _http_querystring_xlate(zval *array, zval *param, const char *i
 #define http_querystring_update(qa, qs) _http_querystring_update((qa), (qs) TSRMLS_CC)
 PHP_HTTP_API void _http_querystring_update(zval *qarray, zval *qstring TSRMLS_DC);
 
-#define http_querystring_modify_array_ex(q, t, k, kl, i, pe) _http_querystring_modify_array_ex((q), (t), (k), (kl), (i), (pe) TSRMLS_CC)
-PHP_HTTP_API int _http_querystring_modify_array_ex(zval *qarray, int key_type, char *key, int keylen, ulong idx, zval *params_entry TSRMLS_DC);
-
-#define http_querystring_modify_array(q, p) _http_querystring_modify_array((q), (p) TSRMLS_CC)
-PHP_HTTP_API int _http_querystring_modify_array(zval *qarray, zval *params TSRMLS_DC);
-
 #define http_querystring_modify(q, p) _http_querystring_modify((q), (p) TSRMLS_CC)
 PHP_HTTP_API int _http_querystring_modify(zval *qarray, zval *params TSRMLS_DC);