split off raphf

[m6w6/ext-http] / php_http_curl_client_datashare.c

diff --git a/php_http_curl_client_datashare.c b/php_http_curl_client_datashare.c
index 3668512bccf93d2f6777e4451adc89fb1fffbd73..1957c2bdba92308aad65b7c071a13e37cc7420e6 100644 (file)
--- a/php_http_curl_client_datashare.c
+++ b/php_http_curl_client_datashare.c
@@ -19,7 +19,7 @@ typedef struct php_http_curl_client_datashare {
 } php_http_curl_client_datashare_t;
 
 
-static void *php_http_curlsh_ctor(void *opaque TSRMLS_DC)
+static void *php_http_curlsh_ctor(void *opaque, void *init_arg TSRMLS_DC)
 {
        return curl_share_init();
 }
@@ -37,7 +37,7 @@ static php_http_client_datashare_t *php_http_curl_client_datashare_init(php_http
        php_http_curl_client_datashare_t *curl;
        TSRMLS_FETCH_FROM_CTX(h->ts);
 
-       if (!handle && !(handle = php_http_resource_factory_handle_ctor(h->rf TSRMLS_CC))) {
+       if (!handle && !(handle = php_resource_factory_handle_ctor(h->rf, NULL TSRMLS_CC))) {
                php_http_error(HE_WARNING, PHP_HTTP_E_CLIENT_DATASHARE, "could not initialize curl share handle");
                return NULL;
        }
@@ -54,7 +54,7 @@ static void php_http_curl_client_datashare_dtor(php_http_client_datashare_t *h)
        php_http_curl_client_datashare_t *curl = h->ctx;
        TSRMLS_FETCH_FROM_CTX(h->ts);
 
-       php_http_resource_factory_handle_dtor(h->rf, curl->handle TSRMLS_CC);
+       php_resource_factory_handle_dtor(h->rf, curl->handle TSRMLS_CC);
 
        efree(curl);
        h->ctx = NULL;
@@ -140,7 +140,7 @@ static STATUS php_http_curl_client_datashare_setopt(php_http_client_datashare_t
        return SUCCESS;
 }
 
-static php_http_resource_factory_ops_t php_http_curlsh_resource_factory_ops = {
+static php_resource_factory_ops_t php_http_curlsh_resource_factory_ops = {
        php_http_curlsh_ctor,
        NULL,
        php_http_curlsh_dtor
@@ -212,7 +212,7 @@ zend_object_value php_http_curl_client_datashare_object_new_ex(zend_class_entry
 
 PHP_MINIT_FUNCTION(http_curl_client_datashare)
 {
-       if (SUCCESS != php_http_persistent_handle_provide(ZEND_STRL("http_client_datashare.curl"), &php_http_curlsh_resource_factory_ops, NULL, NULL)) {
+       if (SUCCESS != php_persistent_handle_provide(ZEND_STRL("http_client_datashare.curl"), &php_http_curlsh_resource_factory_ops, NULL, NULL)) {
                return FAILURE;
        }