X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pqstm.c;h=6d61a192c75abd8399be4f2ab224f04d298146fd;hp=10d57686ae9d5c91fc6db135c00b9c84ef776243;hb=f2b5f0a77cd3d7fbf5a4ba88320dcfbd03f02107;hpb=3b0f6e8d71bc2a7c4f2649fb81ae305f93f9efc3

diff --git a/src/php_pqstm.c b/src/php_pqstm.c
index 10d5768..6d61a19 100644
--- a/src/php_pqstm.c
+++ b/src/php_pqstm.c
@@ -29,7 +29,7 @@ zend_class_entry *php_pqstm_class_entry;
 static zend_object_handlers php_pqstm_object_handlers;
 static HashTable php_pqstm_object_prophandlers;
 
-static void php_pqstm_deallocate(php_pqstm_object_t *obj, zend_bool async, zend_bool silent)
+static void php_pqstm_deallocate(php_pqstm_object_t *obj, zend_bool async, zend_bool silent TSRMLS_DC)
 {
 	if (obj->intern->allocated) {
 		char *quoted_name = PQescapeIdentifier(obj->intern->conn->intern->conn, obj->intern->name, strlen(obj->intern->name));
@@ -75,10 +75,11 @@ static void php_pqstm_object_free(void *o TSRMLS_DC)
 	if (obj->intern) {
 		if (obj->intern->conn->intern) {
 			php_pq_callback_dtor(&obj->intern->conn->intern->onevent);
-			php_pqstm_deallocate(obj, 0, 1);
+			php_pqstm_deallocate(obj, 0, 1 TSRMLS_CC);
 			php_pq_object_delref(obj->intern->conn TSRMLS_CC);
 		}
 		efree(obj->intern->name);
+		efree(obj->intern->query);
 		zend_hash_destroy(&obj->intern->bound);
 		if (obj->intern->params) {
 			php_pq_params_free(&obj->intern->params);
@@ -139,19 +140,12 @@ static void php_pqstm_object_read_query(zval *object, void *o, zval *return_valu
 	RETVAL_STRING(obj->intern->query, 1);
 }
 
-static void php_pqstm_object_read_types(zval *object, void *o, zval *return_value)
+static void php_pqstm_object_read_types(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
 	int i;
-	HashTable *ht;
-	php_pqstm_object_t *obj;
-
-	obj = (php_pqstm_object_t *)o;
-	ht = (HashTable *)emalloc(sizeof(HashTable));
-
-	zend_hash_init(ht, obj->intern->params->type.count, NULL, ZVAL_PTR_DTOR, 0);
-	Z_TYPE_P(return_value) = IS_ARRAY;
-	Z_ARRVAL_P(return_value) = ht;
+	php_pqstm_object_t *obj = o;
 
+	array_init_size(return_value, obj->intern->params->type.count);
 	for (i = 0; i < obj->intern->params->type.count; i++) {
 		add_next_index_long(return_value, (long)obj->intern->params->type.oids[i]);
 	}
@@ -186,7 +180,7 @@ static PHP_METHOD(pqstm, __construct) {
 	char *name_str, *query_str;
 	int name_len, *query_len;
 	zend_bool async = 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, "Oss|a/!b", &zconn, php_pqconn_class_entry, &name_str, &name_len, &query_str, &query_len, &ztypes, &async);
@@ -223,7 +217,7 @@ static PHP_METHOD(pqstm, bind) {
 	long param_no;
 	zval **param_ref;
 	zend_error_handling zeh;
-	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, "lZ", &param_no, &param_ref);
@@ -251,7 +245,7 @@ ZEND_END_ARG_INFO();
 static PHP_METHOD(pqstm, exec) {
 	zend_error_handling zeh;
 	zval *zparams = NULL;
-	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, "|a/!", &zparams);
@@ -289,7 +283,7 @@ static PHP_METHOD(pqstm, execAsync) {
 	zend_error_handling zeh;
 	zval *zparams = NULL;
 	php_pq_callback_t resolver = {{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, "|a/!f", &zparams, &resolver.fci, &resolver.fcc);
@@ -329,7 +323,7 @@ ZEND_BEGIN_ARG_INFO_EX(ai_pqstm_desc, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqstm, desc) {
 	zend_error_handling zeh;
-	STATUS rv;
+	ZEND_RESULT_CODE rv;
 
 	zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
 	rv = zend_parse_parameters_none();
@@ -369,7 +363,7 @@ ZEND_END_ARG_INFO();
 static PHP_METHOD(pqstm, descAsync) {
 	zend_error_handling zeh;
 	php_pq_callback_t resolver = {{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, "f", &resolver.fci, &resolver.fcc);
@@ -395,7 +389,7 @@ static PHP_METHOD(pqstm, descAsync) {
 static zend_always_inline void php_pqstm_deallocate_handler(INTERNAL_FUNCTION_PARAMETERS, zend_bool async)
 {
 	zend_error_handling zeh;
-	STATUS rv;
+	ZEND_RESULT_CODE rv;
 
 	zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
 	rv = zend_parse_parameters_none();
@@ -429,7 +423,7 @@ static PHP_METHOD(pqstm, deallocateAsync)
 static zend_always_inline void php_pqstm_prepare_handler(INTERNAL_FUNCTION_PARAMETERS, zend_bool async)
 {
 	zend_error_handling zeh;
-	STATUS rv;
+	ZEND_RESULT_CODE rv;
 
 	zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
 	rv = zend_parse_parameters_none();