X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_pqcur.c;h=1f639b65e132e26a97dc83ff22a6e76f58576671;hb=79c6c8eafd9f0fb76557f3297d979ba58ff42a59;hp=4197cdf4109492774dffafadf2c7ed2fa1423a9c;hpb=8d0dbf7286d9132be18de64625837afa55409f84;p=m6w6%2Fext-pq

diff --git a/src/php_pqcur.c b/src/php_pqcur.c
index 4197cdf..1f639b6 100644
--- a/src/php_pqcur.c
+++ b/src/php_pqcur.c
@@ -48,7 +48,7 @@ static void cur_close(php_pqcur_object_t *obj, zend_bool async, zend_bool silent
 			}
 		} else {
 			if ((res = php_pq_exec(obj->intern->conn->intern->conn, smart_str_v(&cmd)))) {
-				php_pq_clear_res(res);
+				php_pqres_clear(res);
 			} else if (!silent) {
 				throw_exce(EX_RUNTIME, "Failed to close cursor (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
 			}
@@ -98,7 +98,7 @@ static void cur_fetch_or_move(INTERNAL_FUNCTION_PARAMETERS, const char *action,
 	char *spec_str = "1";
 	size_t spec_len = 1;
 	ZEND_RESULT_CODE rv;
-	php_pq_callback_t resolver = {{0}};
+	php_pq_callback_t resolver = PHP_PQ_CALLBACK_INIT;
 	zend_error_handling zeh;
 
 	zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh);
@@ -176,21 +176,21 @@ static zend_object *php_pqcur_create_object(zend_class_entry *class_type)
 	return &php_pqcur_create_object_ex(class_type, NULL)->zo;
 }
 
-static void php_pqcur_object_read_name(zval *object, void *o, zval *return_value)
+static void php_pqcur_object_read_name(void *o, zval *return_value)
 {
 	php_pqcur_object_t *obj = o;
 
 	RETVAL_STRING(obj->intern->name);
 }
 
-static void php_pqcur_object_read_connection(zval *object, void *o, zval *return_value)
+static void php_pqcur_object_read_connection(void *o, zval *return_value)
 {
 	php_pqcur_object_t *obj = o;
 
 	php_pq_object_to_zval(obj->intern->conn, return_value);
 }
 
-static void php_pqcur_object_gc_connection(zval *object, void *o, zval *return_value)
+static void php_pqcur_object_gc_connection(void *o, zval *return_value)
 {
 	php_pqcur_object_t *obj = o;
 	zval zconn;
@@ -199,14 +199,14 @@ static void php_pqcur_object_gc_connection(zval *object, void *o, zval *return_v
 	add_next_index_zval(return_value, &zconn);
 }
 
-static void php_pqcur_object_read_query(zval *object, void *o, zval *return_value)
+static void php_pqcur_object_read_query(void *o, zval *return_value)
 {
 	php_pqcur_object_t *obj = o;
 
 	RETVAL_STRING(obj->intern->decl + obj->intern->query_offset);
 }
 
-static void php_pqcur_object_read_flags(zval *object, void *o, zval *return_value)
+static void php_pqcur_object_read_flags(void *o, zval *return_value)
 {
 	php_pqcur_object_t *obj = o;
 
@@ -400,7 +400,7 @@ static PHP_METHOD(pqcur, moveAsync)
 }
 
 static zend_function_entry php_pqcur_methods[] = {
-	PHP_ME(pqcur, __construct, ai_pqcur___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(pqcur, __construct, ai_pqcur___construct, ZEND_ACC_PUBLIC)
 	PHP_ME(pqcur, open, ai_pqcur_open, ZEND_ACC_PUBLIC)
 	PHP_ME(pqcur, openAsync, ai_pqcur_openAsync, ZEND_ACC_PUBLIC)
 	PHP_ME(pqcur, close, ai_pqcur_close, ZEND_ACC_PUBLIC)
@@ -409,7 +409,7 @@ static zend_function_entry php_pqcur_methods[] = {
 	PHP_ME(pqcur, move, ai_pqcur_move, ZEND_ACC_PUBLIC)
 	PHP_ME(pqcur, fetchAsync, ai_pqcur_fetchAsync, ZEND_ACC_PUBLIC)
 	PHP_ME(pqcur, moveAsync, ai_pqcur_moveAsync, ZEND_ACC_PUBLIC)
-	{NULL, NULL, NULL}
+	{0}
 };
 
 PHP_MSHUTDOWN_FUNCTION(pqcur)
@@ -433,7 +433,7 @@ PHP_MINIT_FUNCTION(pqcur)
 	php_pqcur_object_handlers.read_property = php_pq_object_read_prop;
 	php_pqcur_object_handlers.write_property = php_pq_object_write_prop;
 	php_pqcur_object_handlers.clone_obj = NULL;
-	php_pqcur_object_handlers.get_property_ptr_ptr = NULL;
+	php_pqcur_object_handlers.get_property_ptr_ptr = php_pq_object_get_prop_ptr_null;
 	php_pqcur_object_handlers.get_gc = php_pq_object_get_gc;
 	php_pqcur_object_handlers.get_properties = php_pq_object_properties;
 	php_pqcur_object_handlers.get_debug_info = php_pq_object_debug_info;