diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-04-26 16:53:58 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-04-26 16:53:58 +0200 |
| commit | 31822920151b82b33db4e76d6c820e5252dd4317 (patch) | |
| tree | 6c97cc9213a62013127fdd2e3437515595eacf5b | |
| parent | 86cff0bd4c135b70d6d3c336efcd7db768f0a079 (diff) | |
| download | php-git-31822920151b82b33db4e76d6c820e5252dd4317.tar.gz | |
Fix unused variable warnings
| -rw-r--r-- | ext/standard/string.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index a7f1959af9..0f6780fff0 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -3201,7 +3201,7 @@ static zend_string *php_str_to_str_ex(zend_string *haystack, if (needle_len < ZSTR_LEN(haystack)) { const char *end; - const char *s, *p, *r; + const char *p, *r; char *e; if (needle_len == str_len) { @@ -3238,7 +3238,7 @@ static zend_string *php_str_to_str_ex(zend_string *haystack, new_str = zend_string_alloc(count * (str_len - needle_len) + ZSTR_LEN(haystack), 0); } - s = e = ZSTR_VAL(new_str); + e = ZSTR_VAL(new_str); end = ZSTR_VAL(haystack) + ZSTR_LEN(haystack); for (p = ZSTR_VAL(haystack); (r = (char*)php_memnstr(p, needle, needle_len, end)); p = r + needle_len) { memcpy(e, p, r - p); @@ -3284,7 +3284,7 @@ static zend_string *php_str_to_str_i_ex(zend_string *haystack, const char *lc_ha if (ZSTR_LEN(needle) < ZSTR_LEN(haystack)) { const char *end; - const char *s, *p, *r; + const char *p, *r; char *e; if (ZSTR_LEN(needle) == str_len) { @@ -3328,7 +3328,7 @@ static zend_string *php_str_to_str_i_ex(zend_string *haystack, const char *lc_ha new_str = zend_string_alloc(count * (str_len - ZSTR_LEN(lc_needle)) + ZSTR_LEN(haystack), 0); } - s = e = ZSTR_VAL(new_str); + e = ZSTR_VAL(new_str); end = lc_haystack + ZSTR_LEN(haystack); for (p = lc_haystack; (r = (char*)php_memnstr(p, ZSTR_VAL(lc_needle), ZSTR_LEN(lc_needle), end)); p = r + ZSTR_LEN(lc_needle)) { |