com php-src: more fixes to string.c: ext/standard/string.c
| From: | Anatol Belski | Date: | Wed, 16 Oct 2013 10:05:14 +0000 |
| Subject: | com php-src: more fixes to string.c: ext/standard/string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73494@lists.php.net to get a copy of this message | ||
Commit: 63cf4c45ca03e9b5b5327a5cc0e64272a7676997
Author: Anatol Belski <ab@php.net> Mon, 29 Jul 2013 04:50:47 -0700
Parents: 010b8114cc7d71c0957ff0a77e9d2c1cfe16e9f3
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=63cf4c45ca03e9b5b5327a5cc0e64272a7676997
Log:
more fixes to string.c
Changed paths:
M ext/standard/string.c
Diff:
diff --git a/ext/standard/string.c b/ext/standard/string.c
index c448eec..493e8c1 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2285,7 +2285,7 @@ PHP_FUNCTION(substr_replace)
zval **repl;
char *result;
zend_str_size result_len;
- int l = 0;
+ int l = 0; /* l and f should be size_t, however this needs much closer below logic
investigation.*/
int f;
int argc = ZEND_NUM_ARGS();
@@ -3221,7 +3221,7 @@ PHP_FUNCTION(similar_text)
char *t1, *t2;
zval **percent = NULL;
int ac = ZEND_NUM_ARGS();
- int sim;
+ zend_str_size_int sim;
zend_str_size t1_len, t2_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|Z", &t1, &t1_len,
&t2, &t2_len, &percent) == FAILURE) {
@@ -4140,7 +4140,7 @@ static void php_hebrev(INTERNAL_FUNCTION_PARAMETERS, int convert_newlines)
}
}
if (char_count == max_chars) { /* try to avoid breaking words */
- int new_char_count=char_count, new_begin=begin;
+ zend_str_size_int new_char_count=char_count, new_begin=begin;
while (new_char_count > 0) {
if (_isblank(heb_str[new_begin]) || _isnewline(heb_str[new_begin])) {