X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pqcopy.c;h=1ab3ad984f561099fab0c4c928c564aace4f4e9f;hp=2413268487de4a70fe3551cfe911f5d50bd4485a;hb=7ebb278e7854e8dd7c4fd6c0363531642d135676;hpb=1e2615005272bb2347820bccb38c94b9caccafb8

diff --git a/src/php_pqcopy.c b/src/php_pqcopy.c
index 2413268..1ab3ad9 100644
--- a/src/php_pqcopy.c
+++ b/src/php_pqcopy.c
@@ -141,7 +141,7 @@ static PHP_METHOD(pqcopy, __construct) {
 			smart_str_appendl(&cmd, opt_str, opt_len);
 			smart_str_0(&cmd);
 
-			res = PQexec(conn_obj->intern->conn, smart_str_v(&cmd));
+			res = php_pq_exec(conn_obj->intern->conn, smart_str_v(&cmd));
 
 			if (!res) {
 				throw_exce(EX_RUNTIME, "Failed to start %s (%s)", smart_str_v(&cmd), PHP_PQerrorMessage(obj->intern->conn->intern->conn));
@@ -155,7 +155,7 @@ static PHP_METHOD(pqcopy, __construct) {
 					php_pq_object_addref(conn_obj);
 				}
 
-				PHP_PQclear(res);
+				php_pqres_clear(res);
 			}
 
 			smart_str_free(&cmd);
@@ -223,7 +223,7 @@ static PHP_METHOD(pqcopy, end) {
 					throw_exce(EX_RUNTIME, "Failed to fetch COPY result (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
 				} else {
 					php_pqres_success(res);
-					PHP_PQclear(res);
+					php_pqres_clear(res);
 				}
 			}
 
@@ -241,7 +241,7 @@ static PHP_METHOD(pqcopy, get) {
 	ZEND_RESULT_CODE rv;
 
 	zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh);
-	rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zdata);
+	rv = zend_parse_parameters(ZEND_NUM_ARGS(), "z", &zdata);
 	zend_restore_error_handling(&zeh);
 
 	if (SUCCESS == rv) {
@@ -268,7 +268,7 @@ static PHP_METHOD(pqcopy, get) {
 					throw_exce(EX_RUNTIME, "Failed to fetch COPY result (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
 				} else {
 					php_pqres_success(res);
-					PHP_PQclear(res);
+					php_pqres_clear(res);
 					RETVAL_FALSE;
 				}
 				break;
@@ -293,7 +293,7 @@ static PHP_METHOD(pqcopy, get) {
 }
 
 static zend_function_entry php_pqcopy_methods[] = {
-	PHP_ME(pqcopy, __construct, ai_pqcopy_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(pqcopy, __construct, ai_pqcopy_construct, ZEND_ACC_PUBLIC)
 	PHP_ME(pqcopy, put, ai_pqcopy_put, ZEND_ACC_PUBLIC)
 	PHP_ME(pqcopy, end, ai_pqcopy_end, ZEND_ACC_PUBLIC)
 	PHP_ME(pqcopy, get, ai_pqcopy_get, ZEND_ACC_PUBLIC)
@@ -321,7 +321,7 @@ PHP_MINIT_FUNCTION(pqcopy)
 	php_pqcopy_object_handlers.read_property = php_pq_object_read_prop;
 	php_pqcopy_object_handlers.write_property = php_pq_object_write_prop;
 	php_pqcopy_object_handlers.clone_obj = NULL;
-	php_pqcopy_object_handlers.get_property_ptr_ptr = NULL;
+	php_pqcopy_object_handlers.get_property_ptr_ptr = php_pq_object_get_prop_ptr_null;
 	php_pqcopy_object_handlers.get_gc = php_pq_object_get_gc;
 	php_pqcopy_object_handlers.get_properties = php_pq_object_properties;
 	php_pqcopy_object_handlers.get_debug_info = php_pq_object_debug_info;