From: Michael Wallner Date: Wed, 17 Dec 2014 07:39:12 +0000 (+0100) Subject: simplify X-Git-Tag: v0.6.0RC1~14 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=503262d1da0dfeb5b947d95f5b8eb18c8ba41ac9;p=m6w6%2Fext-pq simplify --- diff --git a/src/php_pqstm.c b/src/php_pqstm.c index 0dd2ebc..d360d0d 100644 --- a/src/php_pqstm.c +++ b/src/php_pqstm.c @@ -140,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]); }