iliaa Wed Feb 11 14:26:53 2009 UTC Modified files: /php-src/ext/mbstring mbstring.c Log: MFB: Improved param parsing http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.313&r2=1.314&diff_format=u Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.313 php-src/ext/mbstring/mbstring.c:1.314 --- php-src/ext/mbstring/mbstring.c:1.313 Mon Feb 9 15:34:23 2009 +++ php-src/ext/mbstring/mbstring.c Wed Feb 11 14:26:53 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.313 2009/02/09 15:34:23 iliaa Exp $ */ +/* $Id: mbstring.c,v 1.314 2009/02/11 14:26:53 iliaa Exp $ */ /* * PHP 4 Multibyte String module "mbstring" @@ -1721,17 +1721,16 @@ Sets the current detect_order or Return the current detect_order as a array */ PHP_FUNCTION(mb_detect_order) { - size_t argc = ZEND_NUM_ARGS(); - zval **arg1; + zval **arg1 = NULL; int n, size; enum mbfl_no_encoding *list, *entry; char *name; - if (zend_parse_parameters(argc TSRMLS_CC, "|Z", &arg1) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|Z", &arg1) == FAILURE) { return; } - if (argc == 0) { + if (!arg1) { array_init(return_value); entry = MBSTRG(current_detect_order_list); n = MBSTRG(current_detect_order_list_size); @@ -1784,13 +1783,13 @@ Sets the current substitute_character or returns the current substitute_character */ PHP_FUNCTION(mb_substitute_character) { - zval **arg1; + zval **arg1 = NULL; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|Z", &arg1) == FAILURE) { return; } - if (ZEND_NUM_ARGS() == 0) { + if (!arg1) { if (MBSTRG(current_filter_illegal_mode) == MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) { RETURN_STRING("none", 1); } else if (MBSTRG(current_filter_illegal_mode) == MBFL_OUTPUTFILTER_ILLEGAL_MODE_LONG) {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php