diff options
author | Anatol Belski <ab@php.net> | 2014-12-13 23:06:14 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-12-13 23:06:14 +0100 |
commit | bdeb220f48825642f84cdbf3ff23a30613c92e86 (patch) | |
tree | 1a6cf34d20420e4815b4becb21311a4457d84103 /ext/com_dotnet/com_iterator.c | |
parent | bb66f385d09e7e55390e9f57fcbca08f6b43ff91 (diff) | |
download | php-git-bdeb220f48825642f84cdbf3ff23a30613c92e86.tar.gz |
first shot remove TSRMLS_* things
Diffstat (limited to 'ext/com_dotnet/com_iterator.c')
-rw-r--r-- | ext/com_dotnet/com_iterator.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/ext/com_dotnet/com_iterator.c b/ext/com_dotnet/com_iterator.c index a7614673f8..20cf6bfc19 100644 --- a/ext/com_dotnet/com_iterator.c +++ b/ext/com_dotnet/com_iterator.c @@ -41,7 +41,7 @@ struct php_com_iterator { zval zdata; }; -static void com_iter_dtor(zend_object_iterator *iter TSRMLS_DC) +static void com_iter_dtor(zend_object_iterator *iter) { struct php_com_iterator *I = (struct php_com_iterator*)Z_PTR(iter->data); @@ -53,7 +53,7 @@ static void com_iter_dtor(zend_object_iterator *iter TSRMLS_DC) zval_ptr_dtor(&I->zdata); } -static int com_iter_valid(zend_object_iterator *iter TSRMLS_DC) +static int com_iter_valid(zend_object_iterator *iter) { struct php_com_iterator *I = (struct php_com_iterator*)Z_PTR(iter->data); @@ -64,14 +64,14 @@ static int com_iter_valid(zend_object_iterator *iter TSRMLS_DC) return FAILURE; } -static zval* com_iter_get_data(zend_object_iterator *iter TSRMLS_DC) +static zval* com_iter_get_data(zend_object_iterator *iter) { struct php_com_iterator *I = (struct php_com_iterator*)Z_PTR(iter->data); return &I->zdata; } -static void com_iter_get_key(zend_object_iterator *iter, zval *key TSRMLS_DC) +static void com_iter_get_key(zend_object_iterator *iter, zval *key) { struct php_com_iterator *I = (struct php_com_iterator*)Z_PTR(iter->data); @@ -82,7 +82,7 @@ static void com_iter_get_key(zend_object_iterator *iter, zval *key TSRMLS_DC) } } -static int com_iter_move_forwards(zend_object_iterator *iter TSRMLS_DC) +static int com_iter_move_forwards(zend_object_iterator *iter) { struct php_com_iterator *I = (struct php_com_iterator*)Z_PTR(iter->data); unsigned long n_fetched; @@ -112,15 +112,15 @@ static int com_iter_move_forwards(zend_object_iterator *iter TSRMLS_DC) return FAILURE; } I->key++; - if (php_com_safearray_get_elem(&I->safe_array, &I->v, (LONG)I->key TSRMLS_CC) == 0) { + if (php_com_safearray_get_elem(&I->safe_array, &I->v, (LONG)I->key) == 0) { I->key = (ulong)-1; return FAILURE; } } ZVAL_NULL(&ptr); - php_com_zval_from_variant(&ptr, &I->v, I->code_page TSRMLS_CC); - /* php_com_wrap_variant(ptr, &I->v, I->code_page TSRMLS_CC); */ + php_com_zval_from_variant(&ptr, &I->v, I->code_page); + /* php_com_wrap_variant(ptr, &I->v, I->code_page); */ ZVAL_COPY_VALUE(&I->zdata, &ptr); return SUCCESS; } @@ -135,7 +135,7 @@ static zend_object_iterator_funcs com_iter_funcs = { NULL }; -zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC) +zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object, int by_ref) { php_com_dotnet_object *obj; struct php_com_iterator *I; @@ -152,7 +152,7 @@ zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object, int b obj = CDNO_FETCH(object); if (V_VT(&obj->v) != VT_DISPATCH && !V_ISARRAY(&obj->v)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "variant is not an object or array VT=%d", V_VT(&obj->v)); + php_error_docref(NULL, E_WARNING, "variant is not an object or array VT=%d", V_VT(&obj->v)); return NULL; } @@ -160,7 +160,7 @@ zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object, int b VariantInit(&v); I = (struct php_com_iterator*)ecalloc(1, sizeof(*I)); - zend_iterator_init(&I->iter TSRMLS_CC); + zend_iterator_init(&I->iter); I->iter.funcs = &com_iter_funcs; Z_PTR(I->iter.data) = I; I->code_page = obj->code_page; @@ -175,7 +175,7 @@ zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object, int b dims = SafeArrayGetDim(V_ARRAY(&obj->v)); if (dims != 1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Can only handle single dimension variant arrays (this array has %d)", dims); goto fail; } @@ -189,10 +189,10 @@ zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object, int b SafeArrayGetUBound(V_ARRAY(&I->safe_array), 1, &I->sa_max); /* pre-fetch the element */ - if (php_com_safearray_get_elem(&I->safe_array, &I->v, bound TSRMLS_CC)) { + if (php_com_safearray_get_elem(&I->safe_array, &I->v, bound)) { I->key = bound; ZVAL_NULL(&ptr); - php_com_zval_from_variant(&ptr, &I->v, I->code_page TSRMLS_CC); + php_com_zval_from_variant(&ptr, &I->v, I->code_page); ZVAL_COPY_VALUE(&I->zdata, &ptr); } else { I->key = (ulong)-1; @@ -226,7 +226,7 @@ zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object, int b /* indicate that we have element 0 */ I->key = 0; ZVAL_NULL(&ptr); - php_com_zval_from_variant(&ptr, &I->v, I->code_page TSRMLS_CC); + php_com_zval_from_variant(&ptr, &I->v, I->code_page); ZVAL_COPY_VALUE(&I->zdata, &ptr); } else { /* indicate that there are no more items */ |