archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

@- Changed setlocale() to use LC_* constants. (Jani)

Browse source
This commit is contained in:
foobar 2000-12-21 13:46:50 +00:00
parent 225a08e8dd
commit c29e24c7e2
1 changed files with 32 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

54
ext/standard/string.c
View file

@ -2362,7 +2362,7 @@ PHP_FUNCTION(strip_tags)
} }
/* }}} */ /* }}} */
/* {{{ proto string setlocale(string category, string locale) /* {{{ proto string setlocale(mixed category, string locale)
Set locale information */ Set locale information */
PHP_FUNCTION(setlocale) PHP_FUNCTION(setlocale)
{ {
@ -2375,34 +2375,44 @@ PHP_FUNCTION(setlocale)
if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2, &pcategory, &plocale)==FAILURE) if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2, &pcategory, &plocale)==FAILURE)
WRONG_PARAM_COUNT; WRONG_PARAM_COUNT;
#ifdef HAVE_SETLOCALE #ifdef HAVE_SETLOCALE
convert_to_string_ex(pcategory);
convert_to_string_ex(plocale); convert_to_string_ex(plocale);
category = *pcategory;
locale = *plocale; locale = *plocale;
if (!strcasecmp ("LC_ALL", category->value.str.val))
cat = LC_ALL; if (Z_TYPE_PP(pcategory) == IS_LONG) {
else if (!strcasecmp ("LC_COLLATE", category->value.str.val)) convert_to_long_ex(pcategory);
cat = LC_COLLATE; cat = Z_LVAL_PP(pcategory);
else if (!strcasecmp ("LC_CTYPE", category->value.str.val)) } else { /* FIXME: The following behaviour should be removed. */
cat = LC_CTYPE; php_error(E_NOTICE,"Passing locale category name as string is deprecated. Use the LC_* -constants instead.");
convert_to_string_ex(pcategory);
category = *pcategory;
if (!strcasecmp ("LC_ALL", category->value.str.val))
cat = LC_ALL;
else if (!strcasecmp ("LC_COLLATE", category->value.str.val))
cat = LC_COLLATE;
else if (!strcasecmp ("LC_CTYPE", category->value.str.val))
cat = LC_CTYPE;
#ifdef LC_MESSAGES #ifdef LC_MESSAGES
else if (!strcasecmp ("LC_MESSAGES", category->value.str.val)) else if (!strcasecmp ("LC_MESSAGES", category->value.str.val))
cat = LC_MESSAGES; cat = LC_MESSAGES;
#endif #endif
else if (!strcasecmp ("LC_MONETARY", category->value.str.val)) else if (!strcasecmp ("LC_MONETARY", category->value.str.val))
cat = LC_MONETARY; cat = LC_MONETARY;
else if (!strcasecmp ("LC_NUMERIC", category->value.str.val)) else if (!strcasecmp ("LC_NUMERIC", category->value.str.val))
cat = LC_NUMERIC; cat = LC_NUMERIC;
else if (!strcasecmp ("LC_TIME", category->value.str.val)) else if (!strcasecmp ("LC_TIME", category->value.str.val))
cat = LC_TIME; cat = LC_TIME;
else { else {
php_error(E_WARNING,"Invalid locale category name %s, must be one of LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC or LC_TIME", category->value.str.val); php_error(E_WARNING,"Invalid locale category name %s, must be one of LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC or LC_TIME", category->value.str.val);
RETURN_FALSE; RETURN_FALSE;
}
} }
if (!strcmp ("0", locale->value.str.val)) if (!strcmp ("0", locale->value.str.val)) {
loc = NULL; loc = NULL;
else } else {
loc = locale->value.str.val; loc = locale->value.str.val;
}
retval = setlocale (cat, loc); retval = setlocale (cat, loc);
if (retval) { if (retval) {
/* Remember if locale was changed */ /* Remember if locale was changed */