diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2002-10-17 22:44:44 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2002-10-17 22:44:44 +0000 |
| commit | 30c16baac27b0e74ce900d9ffdd076b381ad0a0d (patch) | |
| tree | e825cf6b3bd90dd5f7e92a2a606d776429effbfe /ext | |
| parent | 56f744e0df9551be07b05ac950c44dfd7c2963aa (diff) | |
| download | php-git-30c16baac27b0e74ce900d9ffdd076b381ad0a0d.tar.gz | |
Renamed word_count to str_word_count to comply with naming conventions.
Thanks Andi, for catching this oversight.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/basic_functions.c | 2 | ||||
| -rw-r--r-- | ext/standard/php_string.h | 2 | ||||
| -rw-r--r-- | ext/standard/string.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index ee1200b384..626bf636d0 100644 --- 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 0acb3f6543..51ae6e099d 100644 --- 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 52bf54dbbe..80d55eec38 100644 --- 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; |