X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_pqcopy.c;h=c073798efde10630bdc7b6606a3457d15e02b413;hb=b2a9a9cf919161a26c419906a2b73500bd533f96;hp=d652ba6ba6a143785b68652d338a89b27b1ccbf8;hpb=7acdd4b540f114ac8e8103df42633d5f741fb210;p=m6w6%2Fext-pq

diff --git a/src/php_pqcopy.c b/src/php_pqcopy.c
index d652ba6..c073798 100644
--- a/src/php_pqcopy.c
+++ b/src/php_pqcopy.c
@@ -116,7 +116,7 @@ static PHP_METHOD(pqcopy, __construct) {
 	char *expr_str, *opt_str = "";
 	int expr_len, opt_len = 0;
 	long direction;
-	STATUS rv;
+	ZEND_RESULT_CODE rv;
 
 	zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
 	rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Osl|s", &zconn, php_pqconn_class_entry, &expr_str, &expr_len, &direction, &opt_str, &opt_len);
@@ -150,7 +150,7 @@ static PHP_METHOD(pqcopy, __construct) {
 			smart_str_appendl(&cmd, opt_str, opt_len);
 			smart_str_0(&cmd);
 
-			res = PQexec(conn_obj->intern->conn, cmd.c);
+			res = php_pq_exec(conn_obj->intern->conn, cmd.c);
 
 			if (!res) {
 				throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to start %s (%s)", cmd.c, PHP_PQerrorMessage(obj->intern->conn->intern->conn));
@@ -164,7 +164,7 @@ static PHP_METHOD(pqcopy, __construct) {
 					php_pq_object_addref(conn_obj TSRMLS_CC);
 				}
 
-				PHP_PQclear(res);
+				php_pqres_clear(res);
 			}
 
 			smart_str_free(&cmd);
@@ -180,7 +180,7 @@ static PHP_METHOD(pqcopy, put) {
 	zend_error_handling zeh;
 	char *data_str;
 	int data_len;
-	STATUS rv;
+	ZEND_RESULT_CODE rv;
 
 	zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
 	rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data_str, &data_len);
@@ -209,7 +209,7 @@ static PHP_METHOD(pqcopy, end) {
 	zend_error_handling zeh;
 	char *error_str = NULL;
 	int error_len = 0;
-	STATUS rv;
+	ZEND_RESULT_CODE rv;
 
 	zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
 	rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &error_str, &error_len);
@@ -232,7 +232,7 @@ static PHP_METHOD(pqcopy, end) {
 					throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to fetch COPY result (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
 				} else {
 					php_pqres_success(res TSRMLS_CC);
-					PHP_PQclear(res);
+					php_pqres_clear(res);
 				}
 			}
 
@@ -247,7 +247,7 @@ ZEND_END_ARG_INFO();
 static PHP_METHOD(pqcopy, get) {
 	zend_error_handling zeh;
 	zval *zdata;
-	STATUS rv;
+	ZEND_RESULT_CODE rv;
 
 	zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
 	rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zdata);
@@ -277,7 +277,7 @@ static PHP_METHOD(pqcopy, get) {
 					throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to fetch COPY result (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
 				} else {
 					php_pqres_success(res TSRMLS_CC);
-					PHP_PQclear(res);
+					php_pqres_clear(res);
 					RETVAL_FALSE;
 				}
 				break;