archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 14:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4'

Browse source 
* PHP-7.4:
  Removed declaration inside for loops
This commit is contained in:
Matteo Beccati 2019-03-29 14:24:40 +01:00
commit d02c8ede15
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/mbstring/mbstring.c
View file

@ -2267,7 +2267,9 @@ PHP_FUNCTION(mb_str_split)
while (p < last) { /* split cycle work until the cursor has reached the last byte */
char const *chunk_p = p; /* chunk first byte pointer */
chunk_len = 0; /* chunk length in bytes */
for (zend_long char_count = 0; char_count < split_length && p < last; ++char_count) {
zend_long char_count;
for (char_count = 0; char_count < split_length && p < last; ++char_count) {
char unsigned const m = mbtab[*(const unsigned char *)p]; /* single character length table */
chunk_len += m;
p += m;
@ -2335,7 +2337,9 @@ PHP_FUNCTION(mb_str_split)
chunks = (mb_len + split_length - 1) / split_length; /* (round up idiom) */
array_init_size(return_value, chunks);
if (chunks != 0) {
for (zend_long i = 0; i < chunks - 1; p += chunk_len, ++i) {
zend_long i;
for (i = 0; i < chunks - 1; p += chunk_len, ++i) {
add_next_index_stringl(return_value, p, chunk_len);
}
add_next_index_stringl(return_value, p, last - p);