com php-src: Useless ZVAL_UNDEF: ext/sqlite3/sqlite3 .c
| From: | Xinchen Hui | Date: | Wed, 09 Sep 2015 10:00:04 +0000 |
| Subject: | com php-src: Useless ZVAL_UNDEF: ext/sqlite3/sqlite3 .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88974@lists.php.net to get a copy of this message | ||
Commit: 59e8eae4b004c97e1f8f4b16e5a8f0fc344080b5
Author: Xinchen Hui <laruence@gmail.com> Wed, 9 Sep 2015 18:00:04 +0800
Parents: 67d1a478874138ce5979d5988ccf4f7d937e95a6
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=59e8eae4b004c97e1f8f4b16e5a8f0fc344080b5
Log:
Useless ZVAL_UNDEF
Changed paths:
M ext/sqlite3/sqlite3.c
Diff:
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
index 07e37a8..16d37ae 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);
}