cvs: php4 /ext/mbstring mbstring.c
| From: | Moriyoshi Koizumi | Date: | Tue, 11 Feb 2003 03:55:08 +0000 |
| Subject: | cvs: php4 /ext/mbstring mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-18672@lists.php.net to get a copy of this message | ||
moriyoshi Mon Feb 10 22:55:08 2003 EDT
Modified files:
/php4/ext/mbstring mbstring.c
Log:
Fixed ZTS build
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.160 php4/ext/mbstring/mbstring.c:1.161
--- php4/ext/mbstring/mbstring.c:1.160 Mon Feb 3 15:25:25 2003
+++ php4/ext/mbstring/mbstring.c Mon Feb 10 22:55:08 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.160 2003/02/03 20:25:25 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.161 2003/02/11 03:55:08 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -1094,7 +1094,7 @@
int name_len;
enum mbfl_no_encoding no_encoding;
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s", (char **)&name, &name_len) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", (char **)&name,
&name_len) == FAILURE) {
RETURN_FALSE;
}
@@ -1447,7 +1447,7 @@
}
}
- if (offset < 0 || offset > haystack.len) {
+ if (offset < 0 || (unsigned long)offset > haystack.len) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset is out of range");
RETURN_FALSE;
}