update from docs

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

diff --git a/src/php_pqres.c b/src/php_pqres.c
index 0197732f510d2f63dfd12d8977ca86cf7a646afc..d629d251188de57db55ca588bb158bf025388a9d 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 *);
-
-       col = *cols;
+       struct apply_to_col_arg *arg = a;
 
-       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;
        }
 }
@@ -1065,7 +1072,14 @@ static PHP_METHOD(pqres, fetchAll) {
 ZEND_BEGIN_ARG_INFO_EX(ai_pqres_count, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqres, count) {
-       if (SUCCESS == zend_parse_parameters_none()) {
+       zend_error_handling zeh;
+       STATUS rv;
+
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters_none();
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+
+       if (SUCCESS == rv) {
                long count;
 
                if (SUCCESS != php_pqres_count_elements(getThis(), &count TSRMLS_CC)) {
@@ -1079,7 +1093,14 @@ static PHP_METHOD(pqres, count) {
 ZEND_BEGIN_ARG_INFO_EX(ai_pqres_desc, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqres, desc) {
-       if (SUCCESS == zend_parse_parameters_none()) {
+       zend_error_handling zeh;
+       STATUS rv;
+
+       zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+       rv = zend_parse_parameters_none();
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+
+       if (SUCCESS == rv) {
                php_pqres_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (!obj->intern) {