From: Xinchen Hui Date: Wed, 9 Sep 2015 10:00:04 +0000 (+0800) Subject: Useless ZVAL_UNDEF X-Git-Tag: php-7.1.0alpha1~1204 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=59e8eae4b004c97e1f8f4b16e5a8f0fc344080b5;p=php Useless ZVAL_UNDEF --- diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index 07e37a897e..16d37aea9d 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -848,7 +848,6 @@ static int php_sqlite3_callback_compare(void *coll, int a_len, const void *a, in zval retval; int ret; - ZVAL_UNDEF(&retval); collation->fci.fci.size = (sizeof(collation->fci.fci)); collation->fci.fci.function_table = EG(function_table); ZVAL_COPY_VALUE(&collation->fci.fci.function_name, &collation->cmp_func); @@ -881,7 +880,7 @@ static int php_sqlite3_callback_compare(void *coll, int a_len, const void *a, in // (the result of a comparison, i.e. most likely -1, 0, or 1) //I suppose we could accept any scalar return type, though. php_error_docref(NULL, E_WARNING, "An error occurred while invoking the compare callback (invalid return type). Collation behaviour is undefined."); - }else{ + } else { ret = Z_LVAL(retval); }