From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 7 Mar 2014 14:33:36 +0000 (+0800)
Subject: Improve codes
X-Git-Tag: POST_PHPNG_MERGE~412^2~360
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f794ba743c0b96c4834d914ef45ab909c26bb13;p=php

Improve codes
---

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++;