From a94558c855ed4a9a53b3b2db226884a26bff6d4e Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Tue, 8 Dec 2009 01:57:37 +0000 Subject: - Added MAKE_COPY_ZVAL(ppzv, pzv) macro --- ext/sqlite3/sqlite3.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'ext/sqlite3/sqlite3.c') diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index 50a4e75e9b..a888cf683c 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -851,9 +851,7 @@ PHP_METHOD(sqlite3, createFunction) func->func_name = estrdup(sql_func); MAKE_STD_ZVAL(func->func); - *(func->func) = *callback_func; - zval_copy_ctor(func->func); - INIT_PZVAL(func->func); + MAKE_COPY_ZVAL(&callback_func, func->func); func->argc = sql_func_num_args; func->next = db_obj->funcs; @@ -910,14 +908,10 @@ PHP_METHOD(sqlite3, createAggregate) func->func_name = estrdup(sql_func); MAKE_STD_ZVAL(func->step); - *(func->step) = *step_callback; - zval_copy_ctor(func->step); - INIT_PZVAL(func->step); + MAKE_COPY_ZVAL(&step_callback, func->step); MAKE_STD_ZVAL(func->fini); - *(func->fini) = *fini_callback; - zval_copy_ctor(func->fini); - INIT_PZVAL(func->fini); + MAKE_COPY_ZVAL(&fini_callback, func->fini); func->argc = sql_func_num_args; func->next = db_obj->funcs; -- cgit v1.2.1