summaryrefslogtreecommitdiff
path: root/ext/standard/cyr_convert.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/standard/cyr_convert.c')
-rw-r--r--ext/standard/cyr_convert.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/standard/cyr_convert.c b/ext/standard/cyr_convert.c
index bfe1db271a..0fab167fd6 100644
--- a/ext/standard/cyr_convert.c
+++ b/ext/standard/cyr_convert.c
@@ -271,20 +271,20 @@ static char * php_convert_cyr_string(unsigned char *str, char from, char to)
Convert from one Cyrillic character set to another */
PHP_FUNCTION(convert_cyr_string)
{
- pval *str_arg, *fr_cs, *to_cs;
+ pval **str_arg, **fr_cs, **to_cs;
unsigned char *str;
- if (ARG_COUNT(ht) != 3 || getParameters(ht,3,&str_arg, &fr_cs, &to_cs)==FAILURE)
+ if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3,&str_arg,&fr_cs, &to_cs)==FAILURE)
{
WRONG_PARAM_COUNT;
}
- convert_to_string(str_arg);
- convert_to_string(fr_cs);
- convert_to_string(to_cs);
+ convert_to_string_ex(str_arg);
+ convert_to_string_ex(fr_cs);
+ convert_to_string_ex(to_cs);
- str = (unsigned char*) str_arg->value.str.val;
+ str = (unsigned char*) (*str_arg)->value.str.val;
- php_convert_cyr_string(str, fr_cs->value.str.val[0], to_cs->value.str.val[0]);
+ php_convert_cyr_string(str, (*fr_cs)->value.str.val[0],(*to_cs)->value.str.val[0]);
RETVAL_STRING((char *)str, 1)
}
/* }}} */