code cleanup

[m6w6/ext-http] / php_http_client.h

diff --git a/php_http_client.h b/php_http_client.h
index 24067a98ea8daf28ec7f83060e104a890cfccfd9..b5aeb5737e1751937fe5f0fb7fdd69ed19adf5a7 100644 (file)
--- a/php_http_client.h
+++ b/php_http_client.h
@@ -108,7 +108,7 @@ static inline void php_http_client_progress_notify(php_http_client_progress_t *p
 typedef enum php_http_client_setopt_opt {
        PHP_HTTP_CLIENT_OPT_SETTINGS,                                           /* HashTable* */
        PHP_HTTP_CLIENT_OPT_PROGRESS_CALLBACK,                          /* php_http_client_progress_callback_t* */
-       PHP_HTTP_CLIENT_OPT_COOKIES_ENABLE,                             /* - */
+       PHP_HTTP_CLIENT_OPT_COOKIES_ENABLE,                                     /* - */
        PHP_HTTP_CLIENT_OPT_COOKIES_RESET,                                      /* - */
        PHP_HTTP_CLIENT_OPT_COOKIES_RESET_SESSION,                      /* - */
        PHP_HTTP_CLIENT_OPT_COOKIES_FLUSH,                                      /* - */
@@ -136,6 +136,8 @@ typedef struct php_http_client_ops {
        php_http_client_exec_func_t exec;
        php_http_client_setopt_func_t setopt;
        php_http_client_getopt_func_t getopt;
+       php_http_new_t create_object;
+       zend_class_entry *(*class_entry)(void);
 } php_http_client_ops_t;
 
 typedef struct php_http_client {
@@ -164,18 +166,20 @@ typedef struct php_http_client_object {
        php_http_client_t *client;
 } php_http_client_object_t;
 
-extern zend_class_entry *php_http_client_class_entry;
-extern zend_function_entry php_http_client_method_entry[];
+zend_object_value php_http_client_object_new(zend_class_entry *ce TSRMLS_DC);
+zend_object_value php_http_client_object_new_ex(zend_class_entry *ce, php_http_client_t *r, php_http_client_object_t **ptr TSRMLS_DC);
+zend_object_value php_http_client_object_clone(zval *zobject TSRMLS_DC);
+void php_http_client_object_free(void *object TSRMLS_DC);
 
-extern zend_object_value php_http_client_object_new(zend_class_entry *ce TSRMLS_DC);
-extern zend_object_value php_http_client_object_new_ex(zend_class_entry *ce, php_http_client_t *r, php_http_client_object_t **ptr TSRMLS_DC);
-extern zend_object_value php_http_client_object_clone(zval *zobject TSRMLS_DC);
-extern void php_http_client_object_free(void *object TSRMLS_DC);
+zend_class_entry *php_http_client_get_class_entry(void);
+zend_object_handlers *php_http_client_get_object_handlers(void);
 
-extern zend_object_handlers *php_http_client_get_object_handlers(void);
+STATUS php_http_client_object_handle_request(zval *zclient, zval **zreq TSRMLS_DC);
+STATUS php_http_client_object_handle_response(zval *zclient TSRMLS_DC);
 
-extern STATUS php_http_client_object_requesthandler(php_http_client_object_t *obj, zval *this_ptr, char **meth, char **url, php_http_message_body_t **body TSRMLS_DC);
-extern STATUS php_http_client_object_responsehandler(php_http_client_object_t *obj, zval *this_ptr TSRMLS_DC);
+void php_http_client_options_set(zval *this_ptr, zval *opts TSRMLS_DC);
+void php_http_client_options_set_subr(zval *this_ptr, char *key, size_t len, zval *opts, int overwrite TSRMLS_DC);
+void php_http_client_options_get_subr(zval *this_ptr, char *key, size_t len, zval *return_value TSRMLS_DC);
 
 PHP_METHOD(HttpClient, __construct);
 PHP_METHOD(HttpClient, getObservers);
@@ -195,17 +199,17 @@ PHP_METHOD(HttpClient, setCookies);
 PHP_METHOD(HttpClient, enableCookies);
 PHP_METHOD(HttpClient, resetCookies);
 PHP_METHOD(HttpClient, flushCookies);
+PHP_METHOD(HttpClient, setRequest);
+PHP_METHOD(HttpClient, getRequest);
 PHP_METHOD(HttpClient, send);
 PHP_METHOD(HttpClient, getResponseMessage);
-PHP_METHOD(HttpClient, getRawResponseMessage);
 PHP_METHOD(HttpClient, getRequestMessage);
-PHP_METHOD(HttpClient, getRawRequestMessage);
 PHP_METHOD(HttpClient, getHistory);
 PHP_METHOD(HttpClient, clearHistory);
-PHP_METHOD(HttpClient, getMessageClass);
-PHP_METHOD(HttpClient, setMessageClass);
+PHP_METHOD(HttpClient, getResponseMessageClass);
+PHP_METHOD(HttpClient, setResponseMessageClass);
 
-extern PHP_MINIT_FUNCTION(http_client);
+PHP_MINIT_FUNCTION(http_client);
 
 #endif