update from docs

[m6w6/ext-pq] / src / php_pqres.c

diff --git a/src/php_pqres.c b/src/php_pqres.c
index 2c756558fef2bc1800b6154e8469e7681a113098..9b35f21011bde83dce3db70fb7cfec92c3597897 100644 (file)
--- a/src/php_pqres.c
+++ b/src/php_pqres.c
@@ -98,10 +98,13 @@ zval *php_pqres_typed_zval(php_pqres_t *res, char *val, size_t len, Oid typ TSRM
        MAKE_STD_ZVAL(zv);
 
        if (SUCCESS == zend_hash_index_find(&res->converters, typ, (void *) &zconv)) {
-               zval *tmp = NULL;
+               zval *ztype, *tmp = NULL;
 
+               MAKE_STD_ZVAL(ztype);
+               ZVAL_LONG(ztype, typ);
                ZVAL_STRINGL(zv, val, len, 1);
-               zend_call_method_with_1_params(zconv, NULL, NULL, "convertfromstring", &tmp, zv);
+               zend_call_method_with_2_params(zconv, NULL, NULL, "convertfromstring", &tmp, zv, ztype);
+               zval_ptr_dtor(&ztype);
 
                if (tmp) {
                        zval_ptr_dtor(&zv);
@@ -873,37 +876,41 @@ static PHP_METHOD(pqres, fetchAllCols) {
        }
 }
 
-static int apply_to_col(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key)
+struct apply_to_col_arg {
+       php_pqres_object_t *obj;
+       php_pqres_col_t *cols;
+       STATUS status;
+};
+
+static int apply_to_col(void *p, void *a TSRMLS_DC)
 {
        zval **c = p;
-       php_pqres_object_t *obj = va_arg(argv, php_pqres_object_t *);
-       php_pqres_col_t *col, **cols = va_arg(argv, php_pqres_col_t **);
-       STATUS *rv = va_arg(argv, STATUS *);
+       struct apply_to_col_arg *arg = a;
 
-       col = *cols;
-
-       if (SUCCESS != column_nn(obj, *c, col TSRMLS_CC)) {
-               *rv = FAILURE;
+       if (SUCCESS != column_nn(arg->obj, *c, arg->cols TSRMLS_CC)) {
+               arg->status = FAILURE;
                return ZEND_HASH_APPLY_STOP;
        } else {
-               *rv = SUCCESS;
-               ++*cols;
+               arg->status = SUCCESS;
+               ++arg->cols;
                return ZEND_HASH_APPLY_KEEP;
        }
 }
 
 static php_pqres_col_t *php_pqres_convert_to_cols(php_pqres_object_t *obj, HashTable *ht TSRMLS_DC)
 {
-       php_pqres_col_t *tmp, *cols = ecalloc(zend_hash_num_elements(ht), sizeof(*cols));
-       STATUS rv = SUCCESS;
+       struct apply_to_col_arg arg = {NULL};
+       php_pqres_col_t *tmp;
 
-       tmp = cols;
-       zend_hash_apply_with_arguments(ht TSRMLS_CC, apply_to_col, 2, obj, &tmp, &rv);
+       arg.obj = obj;
+       arg.cols = ecalloc(zend_hash_num_elements(ht), sizeof(*tmp));
+       tmp = arg.cols;
+       zend_hash_apply_with_argument(ht, apply_to_col, &arg TSRMLS_CC);
 
-       if (SUCCESS == rv) {
-               return cols;
+       if (SUCCESS == arg.status) {
+               return tmp;
        } else {
-               efree(cols);
+               efree(tmp);
                return NULL;
        }
 }
@@ -1136,7 +1143,7 @@ PHP_MINIT_FUNCTION(pqres)
        php_pqres_object_handlers.get_properties = php_pq_object_properties;
        php_pqres_object_handlers.count_elements = php_pqres_count_elements;
 
-       zend_hash_init(&php_pqres_object_prophandlers, 6, NULL, NULL, 1);
+       zend_hash_init(&php_pqres_object_prophandlers, 8, NULL, NULL, 1);
 
        zend_declare_property_null(php_pqres_class_entry, ZEND_STRL("status"), ZEND_ACC_PUBLIC TSRMLS_CC);
        ph.read = php_pqres_object_read_status;