cvs: php4 /ext/standard basic_functions.c php_string.h string.c

iliaa Thu Oct 17 18:44:45 2002 EDT Modified files: /php4/ext/standard basic_functions.c php_string.h string.c Log: Renamed word_count to str_word_count to comply with naming conventions. Thanks Andi, for catching this oversight. Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.529 php4/ext/standard/basic_functions.c:1.530 --- php4/ext/standard/basic_functions.c:1.529 Wed Oct 16 23:27:19 2002 +++ php4/ext/standard/basic_functions.c Thu Oct 17 18:44:43 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.529 2002/10/17 03:27:19 iliaa Exp $ */ +/* $Id: basic_functions.c,v 1.530 2002/10/17 22:44:43 iliaa Exp $ */ #include "php.h" #include "php_streams.h" @@ -334,7 +334,7 @@ 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) Index: php4/ext/standard/php_string.h diff -u php4/ext/standard/php_string.h:1.64 php4/ext/standard/php_string.h:1.65 --- php4/ext/standard/php_string.h:1.64 Wed Oct 16 23:27:19 2002 +++ php4/ext/standard/php_string.h Thu Oct 17 18:44:44 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_string.h,v 1.64 2002/10/17 03:27:19 iliaa Exp $ */ +/* $Id: php_string.h,v 1.65 2002/10/17 22:44:44 iliaa Exp $ */ /* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */ @@ -83,7 +83,7 @@ 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 Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.324 php4/ext/standard/string.c:1.325 --- php4/ext/standard/string.c:1.324 Wed Oct 16 23:27:19 2002 +++ php4/ext/standard/string.c Thu Oct 17 18:44:44 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.324 2002/10/17 03:27:19 iliaa Exp $ */ +/* $Id: string.c,v 1.325 2002/10/17 22:44:44 iliaa Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -4027,7 +4027,7 @@ } /* }}} */ -/* {{{ 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 @@ 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;