less intrusive fix

[m6w6/ext-http] / php_http_request_factory.c

diff --git a/php_http_request_factory.c b/php_http_request_factory.c
index 1f5f24141805ede4010b01966c801ec9beefcaef..79e348f15a95b5f1ec15d6945b92b5455062e650 100644 (file)
--- a/php_http_request_factory.c
+++ b/php_http_request_factory.c
@@ -147,13 +147,7 @@ PHP_METHOD(HttpRequestFactory, createRequest)
                                                name_len = spprintf(&name_str, 0, "http_request.%s", Z_STRVAL_P(zdriver));
 
                                                if ((pf = php_http_persistent_handle_concede(NULL , name_str, name_len, Z_STRVAL_P(phi), Z_STRLEN_P(phi) TSRMLS_CC))) {
-                                                       php_http_resource_factory_ops_t ops = {
-                                                                       (php_http_resource_factory_handle_ctor_t) php_http_persistent_handle_acquire,
-                                                                       (php_http_resource_factory_handle_copy_t) php_http_persistent_handle_accrete,
-                                                                       (php_http_resource_factory_handle_dtor_t) php_http_persistent_handle_release
-                                                       };
-
-                                                       rf = php_http_resource_factory_init(NULL, &ops, pf, (void (*)(void *)) php_http_persistent_handle_abandon);
+                                                       rf = php_http_resource_factory_init(NULL, php_http_persistent_handle_resource_factory_ops(), pf, (void (*)(void *)) php_http_persistent_handle_abandon);
                                                }
 
                                                efree(name_str);
@@ -224,13 +218,7 @@ PHP_METHOD(HttpRequestFactory, createPool)
                                                name_len = spprintf(&name_str, 0, "http_request_pool.%s", Z_STRVAL_P(zdriver));
 
                                                if ((pf = php_http_persistent_handle_concede(NULL , name_str, name_len, Z_STRVAL_P(phi), Z_STRLEN_P(phi) TSRMLS_CC))) {
-                                                       php_http_resource_factory_ops_t ops = {
-                                                                       (php_http_resource_factory_handle_ctor_t) php_http_persistent_handle_acquire,
-                                                                       (php_http_resource_factory_handle_copy_t) php_http_persistent_handle_accrete,
-                                                                       (php_http_resource_factory_handle_dtor_t) php_http_persistent_handle_release
-                                                       };
-
-                                                       rf = php_http_resource_factory_init(NULL, &ops, pf, (void (*)(void *)) php_http_persistent_handle_abandon);
+                                                       rf = php_http_resource_factory_init(NULL, php_http_persistent_handle_resource_factory_ops(), pf, (void (*)(void *)) php_http_persistent_handle_abandon);
                                                }
 
                                                efree(name_str);
@@ -291,13 +279,7 @@ PHP_METHOD(HttpRequestFactory, createDataShare)
                                                name_len = spprintf(&name_str, 0, "http_request_datashare.%s", Z_STRVAL_P(zdriver));
 
                                                if ((pf = php_http_persistent_handle_concede(NULL , name_str, name_len, Z_STRVAL_P(phi), Z_STRLEN_P(phi) TSRMLS_CC))) {
-                                                       php_http_resource_factory_ops_t ops = {
-                                                                       (php_http_resource_factory_handle_ctor_t) php_http_persistent_handle_acquire,
-                                                                       (php_http_resource_factory_handle_copy_t) php_http_persistent_handle_accrete,
-                                                                       (php_http_resource_factory_handle_dtor_t) php_http_persistent_handle_release
-                                                       };
-
-                                                       rf = php_http_resource_factory_init(NULL, &ops, pf, (void (*)(void *)) php_http_persistent_handle_abandon);
+                                                       rf = php_http_resource_factory_init(NULL, php_http_persistent_handle_resource_factory_ops(), pf, (void (*)(void *)) php_http_persistent_handle_abandon);
                                                }
 
                                                efree(name_str);