archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

MFH: Added macros for managing zval refcounts and is_ref statuses

Browse source
This commit is contained in:
Yiduo (David) Wang 2007-10-07 05:22:07 +00:00
parent ca4c55ad3a
commit 4b4d634cb9
79 changed files with 924 additions and 864 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/sqlite/sqlite.c
View file

@ -628,7 +628,7 @@ static void php_sqlite_agg_step_function_callback(sqlite_func *func, int argc, c
if (*context_p == NULL) {
MAKE_STD_ZVAL(*context_p);
(*context_p)->is_ref = 1;
Z_SET_ISREF_PP(context_p);
Z_TYPE_PP(context_p) = IS_NULL;
}
@ -899,8 +899,8 @@ static zval * sqlite_instanciate(zend_class_entry *pce, zval *object TSRMLS_DC)
}
Z_TYPE_P(object) = IS_OBJECT;
object_init_ex(object, pce);
object->refcount = 1;
object->is_ref = 1;
Z_SET_REFCOUNT_P(object, 1);
Z_SET_ISREF_P(object);
return object;
}
@ -1016,7 +1016,7 @@ zend_object_iterator *sqlite_get_iterator(zend_class_entry *ce, zval *object, in
if (by_ref) {
zend_error(E_RECOVERABLE_ERROR, "An iterator cannot be used with foreach by reference");
}
object->refcount++;
Z_ADDREF_P(object);
iterator->it.data = (void*)object;
iterator->it.funcs = ce->iterator_funcs.funcs;
iterator->res = obj->u.res;
@ -1858,7 +1858,7 @@ static void php_sqlite_fetch_array(struct php_sqlite_result *res, int mode, zend
if (mode & PHPSQLITE_NUM) {
if (mode & PHPSQLITE_ASSOC) {
add_index_zval(return_value, j, decoded);
ZVAL_ADDREF(decoded);
Z_ADDREF_P(decoded);
add_assoc_zval(return_value, (char*)colnames[j], decoded);
} else {
add_next_index_zval(return_value, decoded);