X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pqconn.c;h=b65023ce9fea366e7109aa2320b5531544176c61;hp=3b920e77aeba9ec17e8cd50b67cc62e418cb71f5;hb=f1cfd1b4749640a7a18cd865c36e4b1ac0f31596;hpb=7e4e6bb2b9271d6e1e24c0bda82a9450d2a5b09f

diff --git a/src/php_pqconn.c b/src/php_pqconn.c
index 3b920e7..b65023c 100644
--- a/src/php_pqconn.c
+++ b/src/php_pqconn.c
@@ -219,7 +219,7 @@ static void php_pqconn_object_write_encoding(zval *object, void *o, zval *value
 	}
 
 	if (0 > PQsetClientEncoding(obj->intern->conn, Z_STRVAL_P(zenc))) {
-		zend_error(E_NOTICE, "Unrecognized encoding '%s'", Z_STRVAL_P(zenc));
+		php_error(E_NOTICE, "Unrecognized encoding '%s'", Z_STRVAL_P(zenc));
 	}
 
 	if (zenc != value) {
@@ -458,7 +458,7 @@ static void php_pqconn_object_write_def_auto_conv(zval*object, void *o, zval *va
 		}
 	}
 
-	obj->intern->default_auto_convert = Z_LVAL_P(zac) & 0xff;
+	obj->intern->default_auto_convert = Z_LVAL_P(zac) & PHP_PQRES_CONV_ALL;
 
 	if (zac != value) {
 		zval_ptr_dtor(&zac);
@@ -573,7 +573,7 @@ static inline PGresult *unlisten(PGconn *conn, const char *channel_str, size_t c
 static int apply_unlisten(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key)
 {
 	php_pqconn_object_t *obj = va_arg(argv, php_pqconn_object_t *);
-	PGresult *res = unlisten(obj->intern->conn, key->arKey, key->nKeyLength - 1);
+	PGresult *res = unlisten(obj->intern->conn, key->arKey, key->nKeyLength - 1 TSRMLS_CC);
 
 	if (res) {
 		PHP_PQclear(res);
@@ -758,7 +758,7 @@ static PHP_METHOD(pqconn, unlisten)
 		if (!obj->intern) {
 			throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
 		} else if (SUCCESS == zend_hash_del(&obj->intern->listeners, channel_str, channel_len + 1)) {
-			PGresult *res = unlisten(obj->intern->conn, channel_str, channel_len);
+			PGresult *res = unlisten(obj->intern->conn, channel_str, channel_len TSRMLS_CC);
 
 			if (res) {
 				php_pqres_success(res TSRMLS_CC);
@@ -1830,20 +1830,25 @@ static PHP_METHOD(pqconn, on) {
 	}
 }
 
-static int apply_set_converter(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key)
+struct apply_set_converter_arg {
+	HashTable *ht;
+	zval **zconv;
+	unsigned add:1;
+};
+
+static int apply_set_converter(void *p, void *a TSRMLS_DC)
 {
-	zval *tmp, **zoid = p, **zcnv = va_arg(argv, zval **);
-	HashTable *converters = va_arg(argv, HashTable *);
-	int add = va_arg(argv, int);
+	zval *tmp, **zoid = p;
+	struct apply_set_converter_arg *arg = a;
 
 	tmp = *zoid;
 	Z_ADDREF_P(tmp);
 	convert_to_long_ex(&tmp);
-	if (add) {
-		Z_ADDREF_PP(zcnv);
-		zend_hash_index_update(converters, Z_LVAL_P(tmp), zcnv, sizeof(zval *), NULL);
+	if (arg->add) {
+		Z_ADDREF_PP(arg->zconv);
+		zend_hash_index_update(arg->ht, Z_LVAL_P(tmp), arg->zconv, sizeof(zval *), NULL);
 	} else {
-		zend_hash_index_del(converters, Z_LVAL_P(tmp));
+		zend_hash_index_del(arg->ht, Z_LVAL_P(tmp));
 	}
 	zval_ptr_dtor(&tmp);
 
@@ -1851,7 +1856,7 @@ static int apply_set_converter(void *p TSRMLS_DC, int argc, va_list argv, zend_h
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_set_converter, 0, 0, 1)
-	ZEND_ARG_OBJ_INFO(0, converter, pq\\ConverterInterface, 0)
+	ZEND_ARG_OBJ_INFO(0, converter, pq\\Converter, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqconn, setConverter) {
 	STATUS rv;
@@ -1869,12 +1874,19 @@ static PHP_METHOD(pqconn, setConverter) {
 			throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
 		} else {
 			zval *tmp, *zoids = NULL;
+			struct apply_set_converter_arg arg = {NULL};
 
 			zend_call_method_with_0_params(&zcnv, NULL, NULL, "converttypes", &zoids);
 			tmp = zoids;
 			Z_ADDREF_P(tmp);
 			convert_to_array_ex(&tmp);
-			zend_hash_apply_with_arguments(Z_ARRVAL_P(tmp) TSRMLS_CC, apply_set_converter, 3, &zcnv, &obj->intern->converters, 1);
+
+			arg.ht = &obj->intern->converters;
+			arg.zconv = &zcnv;
+			arg.add = 1;
+
+			zend_hash_apply_with_argument(Z_ARRVAL_P(tmp), apply_set_converter, &arg TSRMLS_CC);
+
 			zval_ptr_dtor(&tmp);
 			zval_ptr_dtor(&zoids);
 		}
@@ -1882,7 +1894,7 @@ static PHP_METHOD(pqconn, setConverter) {
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_unset_converter, 0, 0, 1)
-	ZEND_ARG_OBJ_INFO(0, converter, pq\\ConverterInterface, 0)
+	ZEND_ARG_OBJ_INFO(0, converter, pq\\Converter, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqconn, unsetConverter) {
 	STATUS rv;
@@ -1900,12 +1912,19 @@ static PHP_METHOD(pqconn, unsetConverter) {
 			throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
 		} else {
 			zval *tmp, *zoids = NULL;
+			struct apply_set_converter_arg arg = {NULL};
 
 			zend_call_method_with_0_params(&zcnv, NULL, NULL, "converttypes", &zoids);
 			tmp = zoids;
 			Z_ADDREF_P(tmp);
 			convert_to_array_ex(&tmp);
-			zend_hash_apply_with_arguments(Z_ARRVAL_P(tmp) TSRMLS_CC, apply_set_converter, 3, &zcnv, &obj->intern->converters, 0);
+
+			arg.ht = &obj->intern->converters;
+			arg.zconv = &zcnv;
+			arg.add = 0;
+
+			zend_hash_apply_with_argument(Z_ARRVAL_P(tmp), apply_set_converter, &arg TSRMLS_CC);
+
 			zval_ptr_dtor(&tmp);
 			zval_ptr_dtor(&zoids);
 		}
@@ -1970,7 +1989,7 @@ PHP_MINIT_FUNCTION(pqconn)
 	php_pqconn_object_handlers.get_properties = php_pq_object_properties;
 	php_pqconn_object_handlers.get_debug_info = php_pq_object_debug_info;
 
-	zend_hash_init(&php_pqconn_object_prophandlers, 14, NULL, NULL, 1);
+	zend_hash_init(&php_pqconn_object_prophandlers, 19, NULL, NULL, 1);
 
 	zend_declare_property_long(php_pqconn_class_entry, ZEND_STRL("status"), CONNECTION_BAD, ZEND_ACC_PUBLIC TSRMLS_CC);
 	ph.read = php_pqconn_object_read_status;