diff options
| author | George Peter Banyard <girgias@php.net> | 2019-08-22 11:09:44 +0200 |
|---|---|---|
| committer | George Peter Banyard <girgias@php.net> | 2019-08-22 12:56:32 +0200 |
| commit | ab76c613fed4b05fac8496b40fbc0941ed25af30 (patch) | |
| tree | 378b9d7b9c16ffe9a2c4bed562559f19db042c09 /ext/standard/string.c | |
| parent | 70fa43edbe50d136d1f99182f897ee5ca8e7c8e0 (diff) | |
| download | php-git-ab76c613fed4b05fac8496b40fbc0941ed25af30.tar.gz | |
Normalise strr(i)pos offset messages with str(i)pos ones.
Diffstat (limited to 'ext/standard/string.c')
| -rw-r--r-- | ext/standard/string.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index c2f29baec7..c3e9660e23 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1989,14 +1989,14 @@ PHP_FUNCTION(strrpos) if (offset >= 0) { if ((size_t)offset > ZSTR_LEN(haystack)) { - php_error_docref(NULL, E_WARNING, "Offset is greater than the length of haystack string"); + php_error_docref(NULL, E_WARNING, "Offset not contained in string"); RETURN_FALSE; } p = ZSTR_VAL(haystack) + (size_t)offset; e = ZSTR_VAL(haystack) + ZSTR_LEN(haystack); } else { if (offset < -INT_MAX || (size_t)(-offset) > ZSTR_LEN(haystack)) { - php_error_docref(NULL, E_WARNING, "Offset is greater than the length of haystack string"); + php_error_docref(NULL, E_WARNING, "Offset not contained in string"); RETURN_FALSE; } p = ZSTR_VAL(haystack); @@ -2042,7 +2042,7 @@ PHP_FUNCTION(strripos) char lowered; if (offset >= 0) { if ((size_t)offset > ZSTR_LEN(haystack)) { - php_error_docref(NULL, E_WARNING, "Offset is greater than the length of haystack string"); + php_error_docref(NULL, E_WARNING, "Offset not contained in string"); RETURN_FALSE; } p = ZSTR_VAL(haystack) + (size_t)offset; @@ -2050,7 +2050,7 @@ PHP_FUNCTION(strripos) } else { p = ZSTR_VAL(haystack); if (offset < -INT_MAX || (size_t)(-offset) > ZSTR_LEN(haystack)) { - php_error_docref(NULL, E_WARNING, "Offset is greater than the length of haystack string"); + php_error_docref(NULL, E_WARNING, "Offset not contained in string"); RETURN_FALSE; } e = ZSTR_VAL(haystack) + (ZSTR_LEN(haystack) + (size_t)offset); @@ -2070,7 +2070,7 @@ PHP_FUNCTION(strripos) if (offset >= 0) { if ((size_t)offset > ZSTR_LEN(haystack)) { zend_string_release_ex(haystack_dup, 0); - php_error_docref(NULL, E_WARNING, "Offset is greater than the length of haystack string"); + php_error_docref(NULL, E_WARNING, "Offset not contained in string"); RETURN_FALSE; } p = ZSTR_VAL(haystack_dup) + offset; @@ -2078,7 +2078,7 @@ PHP_FUNCTION(strripos) } else { if (offset < -INT_MAX || (size_t)(-offset) > ZSTR_LEN(haystack)) { zend_string_release_ex(haystack_dup, 0); - php_error_docref(NULL, E_WARNING, "Offset is greater than the length of haystack string"); + php_error_docref(NULL, E_WARNING, "Offset not contained in string"); RETURN_FALSE; } p = ZSTR_VAL(haystack_dup); |