release 2.4.0

[m6w6/ext-http] / php_http_querystring.h

diff --git a/php_http_querystring.h b/php_http_querystring.h
index ae1d072b305281544bede206feda67d36893c5a7..3391e9132f7fea8cf32418fe3cf3506d7152c9dc 100644 (file)
--- a/php_http_querystring.h
+++ b/php_http_querystring.h
@@ -6,27 +6,20 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_querystring_api.h 292841 2009-12-31 08:48:57Z mike $ */
-
 #ifndef PHP_HTTP_QUERYSTRING_H
 #define PHP_HTTP_QUERYSTRING_H
 
-/* API */
-
 #ifdef PHP_HTTP_HAVE_ICONV
-PHP_HTTP_API STATUS php_http_querystring_xlate(zval *dst, zval *src, const char *ie, const char *oe TSRMLS_DC);
+PHP_HTTP_API ZEND_RESULT_CODE php_http_querystring_xlate(zval *dst, zval *src, const char *ie, const char *oe TSRMLS_DC);
 #endif /* PHP_HTTP_HAVE_ICONV */
-PHP_HTTP_API STATUS php_http_querystring_update(zval *qarray, zval *params, zval *qstring TSRMLS_DC);
-
-/* PHP */
+PHP_HTTP_API ZEND_RESULT_CODE php_http_querystring_update(zval *qarray, zval *params, zval *qstring TSRMLS_DC);
+PHP_HTTP_API ZEND_RESULT_CODE php_http_querystring_ctor(zval *instance, zval *params TSRMLS_DC);
 
-typedef struct php_http_querystring_object {
-       zend_object zo;
-} php_http_querystring_object_t;
+typedef php_http_object_t php_http_querystring_object_t;
 
 #define PHP_HTTP_QUERYSTRING_TYPE_BOOL         IS_BOOL
 #define PHP_HTTP_QUERYSTRING_TYPE_INT          IS_LONG
@@ -35,40 +28,13 @@ typedef struct php_http_querystring_object {
 #define PHP_HTTP_QUERYSTRING_TYPE_ARRAY                IS_ARRAY
 #define PHP_HTTP_QUERYSTRING_TYPE_OBJECT       IS_OBJECT
 
-extern zend_class_entry *php_http_querystring_class_entry;
-extern zend_function_entry php_http_querystring_method_entry[];
+PHP_HTTP_API zend_class_entry *php_http_querystring_class_entry;
 
-extern PHP_MINIT_FUNCTION(http_querystring);
+PHP_MINIT_FUNCTION(http_querystring);
 
 #define php_http_querystring_object_new php_http_object_new
 #define php_http_querystring_object_new_ex php_http_object_new_ex
 
-PHP_METHOD(HttpQueryString, getGlobalInstance);
-PHP_METHOD(HttpQueryString, __construct);
-PHP_METHOD(HttpQueryString, getIterator);
-PHP_METHOD(HttpQueryString, toString);
-PHP_METHOD(HttpQueryString, toArray);
-PHP_METHOD(HttpQueryString, get);
-PHP_METHOD(HttpQueryString, set);
-PHP_METHOD(HttpQueryString, mod);
-PHP_METHOD(HttpQueryString, getBool);
-PHP_METHOD(HttpQueryString, getInt);
-PHP_METHOD(HttpQueryString, getFloat);
-PHP_METHOD(HttpQueryString, getString);
-PHP_METHOD(HttpQueryString, getArray);
-PHP_METHOD(HttpQueryString, getObject);
-#ifdef PHP_HTTP_HAVE_ICONV
-PHP_METHOD(HttpQueryString, xlate);
-#endif /* PHP_HTTP_HAVE_ICONV */
-PHP_METHOD(HttpQueryString, factory);
-PHP_METHOD(HttpQueryString, singleton);
-PHP_METHOD(HttpQueryString, serialize);
-PHP_METHOD(HttpQueryString, unserialize);
-PHP_METHOD(HttpQueryString, offsetGet);
-PHP_METHOD(HttpQueryString, offsetSet);
-PHP_METHOD(HttpQueryString, offsetExists);
-PHP_METHOD(HttpQueryString, offsetUnset);
-
 #endif /* PHP_HTTP_QUERYSTRING_H */
 
 /*