]> granicus.if.org Git - php/commitdiff
Improve codes
authorXinchen Hui <laruence@gmail.com>
Fri, 7 Mar 2014 14:33:36 +0000 (22:33 +0800)
committerXinchen Hui <laruence@gmail.com>
Fri, 7 Mar 2014 14:33:36 +0000 (22:33 +0800)
ext/standard/string.c

index 98b6547b58a60aebbb3fb5657d45b3524cea1b2a..5bfffa02923f01c8dd8c4a33f30ee32025ad86e6 100644 (file)
@@ -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++;