cvs: php-src(PHP_5_2) /ext/standard string.c
| From: | Andrei Zmievski | Date: | Mon, 02 Oct 2006 20:07:14 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/standard string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-40842@lists.php.net to get a copy of this message | ||
andrei Mon Oct 2 20:07:14 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard string.c
Log:
Use php_error_docref() instead.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.21&r2=1.445.2.14.2.22&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.21 php-src/ext/standard/string.c:1.445.2.14.2.22
--- php-src/ext/standard/string.c:1.445.2.14.2.21 Mon Oct 2 19:58:15 2006
+++ php-src/ext/standard/string.c Mon Oct 2 20:07:14 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.445.2.14.2.21 2006/10/02 19:58:15 andrei Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.22 2006/10/02 20:07:14 andrei Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1768,14 +1768,14 @@
if (offset >= 0) {
if (offset > haystack_len) {
- php_error(E_NOTICE, "Offset is greater than the length of haystack string");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is greater than the length of haystack
string");
RETURN_FALSE;
}
p = haystack + offset;
e = haystack + haystack_len - needle_len;
} else {
if (-offset > haystack_len) {
- php_error(E_NOTICE, "Offset is greater than the length of haystack string");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is greater than the length of haystack
string");
RETURN_FALSE;
}
@@ -1844,7 +1844,7 @@
Can also avoid tolower emallocs */
if (offset >= 0) {
if (offset > haystack_len) {
- php_error(E_NOTICE, "Offset is greater than the length of haystack string");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is greater than the length of haystack
string");
RETURN_FALSE;
}
p = haystack + offset;
@@ -1852,7 +1852,7 @@
} else {
p = haystack;
if (-offset > haystack_len) {
- php_error(E_NOTICE, "Offset is greater than the length of haystack string");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is greater than the length of haystack
string");
RETURN_FALSE;
} else {
e = haystack + haystack_len + offset;
@@ -1876,14 +1876,14 @@
if (offset >= 0) {
if (offset > haystack_len) {
- php_error(E_NOTICE, "Offset is greater than the length of haystack string");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is greater than the length of haystack
string");
RETURN_FALSE;
}
p = haystack_dup + offset;
e = haystack_dup + haystack_len - needle_len;
} else {
if (-offset > haystack_len) {
- php_error(E_NOTICE, "Offset is greater than the length of haystack string");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is greater than the length of haystack
string");
RETURN_FALSE;
}
p = haystack_dup;