cvs: php4 /ext/iconv iconv.c

sniper Sat Aug 18 20:05:07 2001 EDT Modified files: /php4/ext/iconv iconv.c Log: ws Index: php4/ext/iconv/iconv.c diff -u php4/ext/iconv/iconv.c:1.19 php4/ext/iconv/iconv.c:1.20 --- php4/ext/iconv/iconv.c:1.19 Sat Aug 11 12:38:47 2001 +++ php4/ext/iconv/iconv.c Sat Aug 18 20:05:06 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iconv.c,v 1.19 2001/08/11 16:38:47 zeev Exp $ */ +/* $Id: iconv.c,v 1.20 2001/08/19 00:05:06 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -51,10 +51,10 @@ /* {{{ iconv_functions[] */ function_entry iconv_functions[] = { - PHP_FE(iconv, NULL) - PHP_FE(ob_iconv_handler, NULL) - PHP_FE(iconv_get_encoding, NULL) - PHP_FE(iconv_set_encoding, NULL) + PHP_FE(iconv, NULL) + PHP_FE(ob_iconv_handler, NULL) + PHP_FE(iconv_get_encoding, NULL) + PHP_FE(iconv_set_encoding, NULL) {NULL, NULL, NULL} }; /* }}} */ @@ -90,8 +90,7 @@ PHP_INI_END() /* }}} */ -static void -php_iconv_init_globals(zend_iconv_globals *iconv_globals) +static void php_iconv_init_globals(zend_iconv_globals *iconv_globals) { iconv_globals->input_encoding = NULL; iconv_globals->output_encoding = NULL; @@ -164,16 +163,16 @@ Returns str converted to the out_charset character set */ PHP_FUNCTION(iconv) { - zval **in_charset, **out_charset, **in_buffer; + zval **in_charset, **out_charset, **in_buffer; char *out_buffer; - if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &in_charset, &out_charset, &in_buffer) == FAILURE) { - WRONG_PARAM_COUNT; - } + if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &in_charset, &out_charset, &in_buffer) == FAILURE) { + WRONG_PARAM_COUNT; + } - convert_to_string_ex(in_charset); - convert_to_string_ex(out_charset); - convert_to_string_ex(in_buffer); + convert_to_string_ex(in_charset); + convert_to_string_ex(out_charset); + convert_to_string_ex(in_buffer); if (php_iconv_string(Z_STRVAL_PP(in_buffer), &out_buffer, Z_STRVAL_PP(in_charset), Z_STRVAL_PP(out_charset)) == SUCCESS) { RETVAL_STRING(out_buffer, 0);