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

danbeck Tue Sep 12 12:00:21 2000 EDT Modified files: /php4/ext/standard basic_functions.c string.c Log: reversed chomp alias addition as per Andi Gutmans' request Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.256 php4/ext/standard/basic_functions.c:1.257 --- php4/ext/standard/basic_functions.c:1.256 Tue Sep 12 08:54:10 2000 +++ php4/ext/standard/basic_functions.c Tue Sep 12 12:00:21 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.256 2000/09/12 15:54:10 danbeck Exp $ */ +/* $Id: basic_functions.c,v 1.257 2000/09/12 19:00:21 danbeck Exp $ */ #include "php.h" #include "php_main.h" @@ -185,7 +185,6 @@ PHP_FE(parse_str, second_arg_force_ref) PHP_FE(str_pad, NULL) PHP_FALIAS(rtrim, chop, NULL) - PHP_FALIAS(chomp, chop, NULL) PHP_FALIAS(strchr, strstr, NULL) PHP_NAMED_FE(sprintf, PHP_FN(user_sprintf), NULL) PHP_NAMED_FE(printf, PHP_FN(user_printf), NULL) Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.156 php4/ext/standard/string.c:1.157 --- php4/ext/standard/string.c:1.156 Tue Sep 12 08:54:10 2000 +++ php4/ext/standard/string.c Tue Sep 12 12:00:21 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.156 2000/09/12 15:54:10 danbeck Exp $ */ +/* $Id: string.c,v 1.157 2000/09/12 19:00:21 danbeck Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -173,10 +173,6 @@ } /* {{{ proto string rtrim(string str) - An alias for chop */ -/* }}} */ - -/* {{{ proto string chomp(string str) An alias for chop */ /* }}} */