X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_querystring_object.c;h=4da97b376007e00a18ae37dcb742afc5c4a8b76a;hp=e026052e3c3394cb5c87c5c0f2f133b85276c6ef;hb=1a0dbb96fbe46a2edec1c813798cef7b0898eebe;hpb=0ecd173659b63e77e47271e5bd521599cd9e500f

diff --git a/http_querystring_object.c b/http_querystring_object.c
index e026052..4da97b3 100644
--- a/http_querystring_object.c
+++ b/http_querystring_object.c
@@ -25,35 +25,37 @@
 #include "php_http_querystring_object.h"
 #include "php_http_exception_object.h"
 
-#define HTTP_BEGIN_ARGS(method, ret_ref, req_args) 	HTTP_BEGIN_ARGS_EX(HttpQueryString, method, ret_ref, req_args)
-#define HTTP_EMPTY_ARGS(method, ret_ref)			HTTP_EMPTY_ARGS_EX(HttpQueryString, method, ret_ref)
+#define HTTP_BEGIN_ARGS(method, req_args) 			HTTP_BEGIN_ARGS_EX(HttpQueryString, method, 0, req_args)
+#define HTTP_EMPTY_ARGS(method)						HTTP_EMPTY_ARGS_EX(HttpQueryString, method, 0)
 #define HTTP_QUERYSTRING_ME(method, visibility)		PHP_ME(HttpQueryString, method, HTTP_ARGS(HttpQueryString, method), visibility)
 #define HTTP_QUERYSTRING_GME(method, visibility)	PHP_ME(HttpQueryString, method, HTTP_ARGS(HttpQueryString, __getter), visibility)
 
-HTTP_BEGIN_ARGS(__construct, 0, 0)
+HTTP_BEGIN_ARGS(__construct, 0)
 	HTTP_ARG_VAL(global, 0)
 	HTTP_ARG_VAL(params, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(getInstance, 0, 0)
+#ifndef WONKY
+HTTP_BEGIN_ARGS(getInstance, 0)
 	HTTP_ARG_VAL(global, 0)
 HTTP_END_ARGS;
+#endif
 
-HTTP_EMPTY_ARGS(toArray, 0);
-HTTP_EMPTY_ARGS(toString, 0);
+HTTP_EMPTY_ARGS(toArray);
+HTTP_EMPTY_ARGS(toString);
 
-HTTP_BEGIN_ARGS(get, 0, 0)
+HTTP_BEGIN_ARGS(get, 0)
 	HTTP_ARG_VAL(name, 0)
 	HTTP_ARG_VAL(type, 0)
 	HTTP_ARG_VAL(defval, 0)
 	HTTP_ARG_VAL(delete, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(set, 0, 1)
+HTTP_BEGIN_ARGS(set, 1)
 	HTTP_ARG_VAL(params, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(__getter, 0, 1)
+HTTP_BEGIN_ARGS(__getter, 1)
 	HTTP_ARG_VAL(name, 0)
 	HTTP_ARG_VAL(defval, 0)
 	HTTP_ARG_VAL(delete, 0)
@@ -76,7 +78,9 @@ zend_function_entry http_querystring_object_fe[] = {
 	HTTP_QUERYSTRING_ME(get, ZEND_ACC_PUBLIC)
 	HTTP_QUERYSTRING_ME(set, ZEND_ACC_PUBLIC)
 	
+#ifndef WONKY
 	HTTP_QUERYSTRING_ME(getInstance, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+#endif
 	
 	HTTP_QUERYSTRING_GME(getBool, ZEND_ACC_PUBLIC)
 	HTTP_QUERYSTRING_GME(getInt, ZEND_ACC_PUBLIC)
@@ -243,6 +247,7 @@ static inline int _http_querystring_modify(zval *qarray, zval *params TSRMLS_DC)
 	}
 }
 
+#ifndef WONKY
 #define http_querystring_instantiate(g) _http_querystring_instantiate((g) TSRMLS_CC)
 static inline zval *_http_querystring_instantiate(zend_bool global TSRMLS_DC)
 {
@@ -260,6 +265,7 @@ static inline zval *_http_querystring_instantiate(zend_bool global TSRMLS_DC)
 	
 	return zobj;
 }
+#endif
 
 #define http_querystring_get(o, t, n, l, def, del, r) _http_querystring_get((o), (t), (n), (l), (def), (del), (r) TSRMLS_CC)
 static inline void _http_querystring_get(zval *this_ptr, int type, char *name, uint name_len, zval *defval, zend_bool del, zval *return_value TSRMLS_DC)
@@ -422,6 +428,7 @@ PHP_METHOD(HttpQueryString, set)
 }
 /* }}} */
 
+#ifndef WONKY
 /* {{{ proto HttpQueryString HttpQueryString::getInstance([bool global = true])
  *
  * Get a single instance (differentiates between the global setting).
@@ -458,6 +465,7 @@ PHP_METHOD(HttpQueryString, getInstance)
 	SET_EH_NORMAL();
 }
 /* }}} */
+#endif
 
 /* {{{ Getters by type */
 #define HTTP_QUERYSTRING_GETTER(method, TYPE) \