summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2014-03-07 22:33:36 +0800
committerXinchen Hui <laruence@gmail.com>2014-03-07 22:33:36 +0800
commit3f794ba743c0b96c4834d914ef45ab909c26bb13 (patch)
tree780422e56af5b051a4e334cdc34813bb961fa333
parentf0989e332f7663536f909e2485fb5198dc06acc8 (diff)
downloadphp-git-3f794ba743c0b96c4834d914ef45ab909c26bb13.tar.gz
Improve codes
-rw-r--r--ext/standard/string.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 98b6547b58..5bfffa0292 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -5347,7 +5347,7 @@ PHP_FUNCTION(str_shuffle)
*/
PHP_FUNCTION(str_word_count)
{
- char c, *str, *char_list = NULL, *p, *e, *s, ch[256];
+ char *str, *char_list = NULL, *p, *e, *s, ch[256];
int str_len, char_list_len = 0, word_count = 0;
long type = 0;
@@ -5399,16 +5399,10 @@ PHP_FUNCTION(str_word_count)
switch (type)
{
case 1:
- c = s[p - s];
- s[p - s] = '\0';
add_next_index_stringl(return_value, s, p - s, 1);
- s[p - s] = c;
break;
case 2:
- c = s[p - s];
- s[p - s] = '\0';
add_index_stringl(return_value, (s - str), s, p - s, 1);
- s[p - s] = c;
break;
default:
word_count++;