|
51 | 51 | /* {{{ iconv_functions[] |
52 | 52 | */ |
53 | 53 | function_entry iconv_functions[] = { |
54 | | - PHP_FE(iconv, NULL) |
55 | | - PHP_FE(ob_iconv_handler, NULL) |
56 | | - PHP_FE(iconv_get_encoding, NULL) |
57 | | - PHP_FE(iconv_set_encoding, NULL) |
| 54 | + PHP_FE(iconv, NULL) |
| 55 | + PHP_FE(ob_iconv_handler, NULL) |
| 56 | + PHP_FE(iconv_get_encoding, NULL) |
| 57 | + PHP_FE(iconv_set_encoding, NULL) |
58 | 58 | {NULL, NULL, NULL} |
59 | 59 | }; |
60 | 60 | /* }}} */ |
@@ -90,8 +90,7 @@ PHP_INI_BEGIN() |
90 | 90 | PHP_INI_END() |
91 | 91 | /* }}} */ |
92 | 92 |
|
93 | | -static void |
94 | | -php_iconv_init_globals(zend_iconv_globals *iconv_globals) |
| 93 | +static void php_iconv_init_globals(zend_iconv_globals *iconv_globals) |
95 | 94 | { |
96 | 95 | iconv_globals->input_encoding = NULL; |
97 | 96 | iconv_globals->output_encoding = NULL; |
@@ -164,16 +163,16 @@ int php_iconv_string(char *in_p, char **out, char *in_charset, char *out_charset |
164 | 163 | Returns str converted to the out_charset character set */ |
165 | 164 | PHP_FUNCTION(iconv) |
166 | 165 | { |
167 | | - zval **in_charset, **out_charset, **in_buffer; |
| 166 | + zval **in_charset, **out_charset, **in_buffer; |
168 | 167 | char *out_buffer; |
169 | 168 |
|
170 | | - if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &in_charset, &out_charset, &in_buffer) == FAILURE) { |
171 | | - WRONG_PARAM_COUNT; |
172 | | - } |
| 169 | + if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &in_charset, &out_charset, &in_buffer) == FAILURE) { |
| 170 | + WRONG_PARAM_COUNT; |
| 171 | + } |
173 | 172 |
|
174 | | - convert_to_string_ex(in_charset); |
175 | | - convert_to_string_ex(out_charset); |
176 | | - convert_to_string_ex(in_buffer); |
| 173 | + convert_to_string_ex(in_charset); |
| 174 | + convert_to_string_ex(out_charset); |
| 175 | + convert_to_string_ex(in_buffer); |
177 | 176 |
|
178 | 177 | if (php_iconv_string(Z_STRVAL_PP(in_buffer), &out_buffer, Z_STRVAL_PP(in_charset), Z_STRVAL_PP(out_charset)) == SUCCESS) { |
179 | 178 | RETVAL_STRING(out_buffer, 0); |
|
0 commit comments