diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-07-25 06:54:20 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-07-25 06:54:20 +0100 |
| commit | 8d5a5fbf6b2504cb1589d1fc9031f89c057ca871 (patch) | |
| tree | b3dc803512d190213efb170a755bfcd6b7ab0a93 /ext/mysqli/mysqli_api.c | |
| parent | 2e8759428b83bd499c4b4571e62c3fb663e18dd6 (diff) | |
| parent | 78ad5e8864feec55e3aecfd96b369a62ffb953ee (diff) | |
| download | php-git-8d5a5fbf6b2504cb1589d1fc9031f89c057ca871.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
minor loop optimizations, closes #2633
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 03a39d7e2e..de1d806f0f 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1210,7 +1210,7 @@ PHP_FUNCTION(mysqli_fetch_fields) zval *mysql_result; zval obj; - unsigned int i; + unsigned int i, num_fields; if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) { return; @@ -1219,8 +1219,9 @@ PHP_FUNCTION(mysqli_fetch_fields) MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID); array_init(return_value); + num_fields = mysql_num_fields(result); - for (i = 0; i < mysql_num_fields(result); i++) { + for (i = 0; i < num_fields; i++) { const MYSQL_FIELD *field = mysql_fetch_field_direct(result, i); object_init(&obj); @@ -1266,7 +1267,7 @@ PHP_FUNCTION(mysqli_fetch_lengths) { MYSQL_RES *result; zval *mysql_result; - unsigned int i; + unsigned int i, num_fields; #if defined(MYSQLI_USE_MYSQLND) const size_t *ret; #else @@ -1284,8 +1285,9 @@ PHP_FUNCTION(mysqli_fetch_lengths) } array_init(return_value); + num_fields = mysql_num_fields(result); - for (i = 0; i < mysql_num_fields(result); i++) { + for (i = 0; i < num_fields; i++) { add_index_long(return_value, i, ret[i]); } } |