Renamed word_count to str_word_count to comply with naming conventions.

Thanks Andi, for catching this oversight.

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index ee1200b38436e7b089c0b03628c254409436a33b..626bf636d02d4796e21a53237c2b9b7ca743e038 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -334,7 +334,7 @@ function_entry basic_functions[] = {
        PHP_FE(stristr,                                                                                                                 NULL)
        PHP_FE(strrchr,                                                                                                                 NULL)
        PHP_FE(str_shuffle,                                                                                                                     NULL)
-       PHP_FE(word_count,                                                                                                              NULL)
+       PHP_FE(str_word_count,                                                                                                          NULL)
 
 #ifdef HAVE_STRCOLL
        PHP_FE(strcoll,                                                                                                                 NULL)

diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h
index 0acb3f654349eb7fb0daab41b9faa0823e04aa4b..51ae6e099d023b6db8dd02db2028fa80127d543e 100644 (file)
--- a/ext/standard/php_string.h
+++ b/ext/standard/php_string.h
@@ -83,7 +83,7 @@ PHP_FUNCTION(substr_count);
 PHP_FUNCTION(str_pad);
 PHP_FUNCTION(sscanf);
 PHP_FUNCTION(str_shuffle);
-PHP_FUNCTION(word_count);
+PHP_FUNCTION(str_word_count);
 #ifdef HAVE_STRCOLL
 PHP_FUNCTION(strcoll);
 #endif

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 52bf54dbbedd453ff5369d08e4a0d1515edbf64c..80d55eec3824684db9c6a183ec0758152976c0d6 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -4027,7 +4027,7 @@ PHP_FUNCTION(str_shuffle)
 }
 /* }}} */
 
-/* {{{ proto void word_count(string str, [int format])
+/* {{{ proto void str_word_count(string str, [int format])
        Counts the number of words inside a string. If format of 1 is specified,
        then the function will return an array containing all the words
        found inside the string. If format of 2 is specified, then the function
@@ -4038,7 +4038,7 @@ PHP_FUNCTION(str_shuffle)
        string containing alphabetic characters, which also may contain, but not start
        with "'" and "-" characters.
 */
-PHP_FUNCTION(word_count)
+PHP_FUNCTION(str_word_count)
 {
        zval **str, **o_format;
        char *s, *e, *p, *buf;