@@ -91,7 +91,7 @@ MYSQLND_METHOD(mysqlnd_result_buffered_c, initialize_result_set_rest)(MYSQLND_RE
91
91
MYSQLND_STATS * stats ,
92
92
zend_bool int_and_float_native )
93
93
{
94
- unsigned int i ;
94
+ unsigned int row , field ;
95
95
enum_func_status ret = PASS ;
96
96
const unsigned int field_count = meta -> field_count ;
97
97
const uint64_t row_count = result -> row_count ;
@@ -106,33 +106,33 @@ MYSQLND_METHOD(mysqlnd_result_buffered_c, initialize_result_set_rest)(MYSQLND_RE
106
106
DBG_RETURN (FAIL );
107
107
}
108
108
109
- for (i = 0 ; i < result -> row_count ; i ++ ) {
109
+ for (row = 0 ; row < result -> row_count ; row ++ ) {
110
110
/* (i / 8) & the_bit_for_i*/
111
- if (initialized [i >> 3 ] & (1 << (i & 7 ))) {
111
+ if (initialized [row >> 3 ] & (1 << (row & 7 ))) {
112
112
continue ;
113
113
}
114
114
115
- rc = result -> m .row_decoder (result -> row_buffers [i ], current_row , field_count , meta -> fields , int_and_float_native , stats );
115
+ rc = result -> m .row_decoder (result -> row_buffers [row ], current_row , field_count , meta -> fields , int_and_float_native , stats );
116
116
117
117
if (rc != PASS ) {
118
118
ret = FAIL ;
119
119
break ;
120
120
}
121
121
result -> initialized_rows ++ ;
122
- initialized [i >> 3 ] |= (1 << (i & 7 ));
123
- for (i = 0 ; i < field_count ; i ++ ) {
122
+ initialized [row >> 3 ] |= (1 << (row & 7 ));
123
+ for (field = 0 ; field < field_count ; field ++ ) {
124
124
/*
125
125
NULL fields are 0 length, 0 is not more than 0
126
126
String of zero size, definitely can't be the next max_length.
127
127
Thus for NULL and zero-length we are quite efficient.
128
128
*/
129
- if (Z_TYPE (current_row [i ]) == IS_STRING ) {
130
- const size_t len = Z_STRLEN (current_row [i ]);
131
- if (meta -> fields [i ].max_length < len ) {
132
- meta -> fields [i ].max_length = len ;
129
+ if (Z_TYPE (current_row [field ]) == IS_STRING ) {
130
+ const size_t len = Z_STRLEN (current_row [field ]);
131
+ if (meta -> fields [field ].max_length < len ) {
132
+ meta -> fields [field ].max_length = len ;
133
133
}
134
134
}
135
- zval_ptr_dtor_nogc (& current_row [i ]);
135
+ zval_ptr_dtor_nogc (& current_row [field ]);
136
136
}
137
137
}
138
138
mnd_efree (current_row );
0 commit comments