diff options
| author | Xinchen Hui <laruence@php.net> | 2015-01-16 00:53:26 -0500 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-01-16 00:53:26 -0500 |
| commit | 584a43d601beb8e22da5b76c018d2e37cb23bda8 (patch) | |
| tree | b4a862365d69c62cf8316da8898f9a43c2325404 | |
| parent | 484216e3c6f7202594b5807e0cd5393371f97125 (diff) | |
| parent | 4633a6f5d62e33f4a9d74d504254a5352d48e8a8 (diff) | |
| download | php-git-584a43d601beb8e22da5b76c018d2e37cb23bda8.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
| -rw-r--r-- | ext/standard/string.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index 11d4d99bc5..44ff94fff3 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -2064,7 +2064,6 @@ PHP_FUNCTION(strripos) zval *zneedle; zend_string *needle; zend_string *haystack; - size_t needle_len; zend_long offset = 0; char *p, *e; char *found; @@ -3112,7 +3111,7 @@ static zend_string* php_char_to_str_ex(zend_string *str, char from, char *to, si size_t char_count = 0; size_t replaced = 0; char lc_from = 0; - char *source, *target, *tmp, *source_end= str->val + str->len, *tmp_end = NULL; + char *source, *target, *source_end= str->val + str->len; if (case_sensitivity) { char *p = str->val, *e = p + str->len; |