mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-01 08:27:59 +00:00
Code Issues Releases Activity

catch up to __part_load_locale() interface change

Browse Source
This commit is contained in:
Alexey Zelkin 2001-02-13 15:32:21 +00:00
parent fc38c1e548
commit 39d2c772eb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=72443
4 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/libc/locale/lmessages.c
View File

@ -51,23 +51,16 @@ static char * messages_locale_buf;
int
__messages_load_locale(const char *name) {
int ret;
ret = __part_load_locale(name, &_messages_using_locale,
messages_locale_buf, "LC_MESSAGES", LCMESSAGES_SIZE_FULL,
/* Propose that we can have incomplete locale file (w/o "{yes,no}str").
Initialize them before loading. In case of complete locale, they'll
be initialized to loaded value, otherwise they'll not be touched. */
_messages_locale.yesstr = empty;
_messages_locale.nostr = empty;
return __part_load_locale(name, &_messages_using_locale,
messages_locale_buf, "LC_MESSAGES",
LCMESSAGES_SIZE_FULL, LCMESSAGES_SIZE_MIN,
(const char **)&_messages_locale);
if (ret == 0) {
/* Assume that we have incomplete locale file (without
* "yesstr" and "nostr" declared. Try it also.
*/
ret = __part_load_locale(name, &_messages_using_locale,
messages_locale_buf, "LC_MESSAGES", LCMESSAGES_SIZE_MIN,
(const char **)&_messages_locale);
if (ret == 0) {
_messages_locale.yesstr = empty;
_messages_locale.nostr = empty;
}
}
return ret;
}
struct lc_messages_T *

3
lib/libc/locale/lmonetary.c
View File

@ -66,7 +66,8 @@ __monetary_load_locale(const char *name) {
int ret;
__mlocale_changed = 1;
ret = __part_load_locale(name, &_monetary_using_locale,
monetary_locale_buf, "LC_MONETARY", LCMONETARY_SIZE,
monetary_locale_buf, "LC_MONETARY",
LCMONETARY_SIZE, LCMONETARY_SIZE,
(const char **)&_monetary_locale);
if (ret == 0 && _monetary_using_locale)
_monetary_locale.mon_grouping =

3
lib/libc/locale/lnumeric.c
View File

@ -54,7 +54,8 @@ __numeric_load_locale(const char *name) {
__nlocale_changed = 1;
ret = __part_load_locale(name, &_numeric_using_locale,
numeric_locale_buf, "LC_NUMERIC", LCNUMERIC_SIZE,
numeric_locale_buf, "LC_NUMERIC",
LCNUMERIC_SIZE, LCNUMERIC_SIZE,
(const char **)&_numeric_locale);
if (ret == 0 && _numeric_using_locale)
_numeric_locale.grouping =

2
lib/libc/stdtime/timelocal.c
View File

@ -106,7 +106,7 @@ __time_load_locale(const char *name) {
int ret;
ret = __part_load_locale(name, &_time_using_locale,
time_locale_buf, "LC_TIME", LCTIME_SIZE,
time_locale_buf, "LC_TIME", LCTIME_SIZE, LCTIME_SIZE,
(const char **)&_time_locale);
/* XXX: always overwrite for ctime format parsing compatibility */