minor loop optimizations, closes #2633

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 04f07a5c93e32496511532b2494f9cc7ccd2de1b..d26f32d652830266e324091f2360330aae3373f4 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -1156,7 +1156,7 @@ void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, zend
 {
 #if !defined(MYSQLI_USE_MYSQLND)
        MYSQL_ROW row;
-       unsigned int    i;
+       unsigned int    i, num_fields;
        MYSQL_FIELD             *fields;
        zend_ulong      *field_len;
 
@@ -1170,8 +1170,9 @@ void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, zend
 
        array_init(return_value);
        field_len = mysql_fetch_lengths(result);
+       num_fields = mysql_num_fields(result);
 
-       for (i = 0; i < mysql_num_fields(result); i++) {
+       for (i = 0; i < num_fields; i++) {
                if (row[i]) {
                        zval res;
 

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index ffdcdaf140aba43c3e9b2083665171e6afbcb0fe..6793fc8065b04bef70e4b7a7e891f690b19b7e22 100644 (file)
--- 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;
        zend_ulong      *ret;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) {
@@ -1280,8 +1281,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]);
        }
 }

diff --git a/win32/sendmail.c b/win32/sendmail.c
index d83663a47526070516d436cedeef96b0d0a11638..808fc8f5fd34e7e1777d56788ddb206fcc2d1f43 100644 (file)
--- a/win32/sendmail.c
+++ b/win32/sendmail.c
@@ -698,10 +698,15 @@ static int PostHeader(char *RPath, char *Subject, char *mailTo, char *xheaders)
        size_t i;
 
        if (xheaders) {
+               size_t headers_lc_len;
+
                if (NULL == (headers_lc = estrdup(xheaders))) {
                        return OUT_OF_MEMORY;
                }
-               for (i = 0; i < strlen(headers_lc); i++) {
+
+               headers_lc_len = strlen(headers_lc);
+
+               for (i = 0; i < headers_lc_len; i++) {
                        headers_lc[i] = tolower(headers_lc[i]);
                }
        }