summaryrefslogtreecommitdiffstats
path: root/lib/libc/locale
diff options
context:
space:
mode:
authorache <ache@FreeBSD.org>2001-02-09 18:16:12 +0000
committerache <ache@FreeBSD.org>2001-02-09 18:16:12 +0000
commit5026efeb4d50f69b56d58ef8baa01adc1e13baa3 (patch)
tree8c9ccd40a7b837fe8a9adc26adcf9c430e5c3deb /lib/libc/locale
parent998c84e156a460517fa60a35e74c9fc7bd81a318 (diff)
downloadFreeBSD-src-5026efeb4d50f69b56d58ef8baa01adc1e13baa3.zip
FreeBSD-src-5026efeb4d50f69b56d58ef8baa01adc1e13baa3.tar.gz
Explicitly mark deprecated entries.
Return currency_symbol for CRNCYSTR Return "%r" for T_FMT_AMPM Remove obsoleted comment about c_fmt Return "" for {YES,NO}STR
Diffstat (limited to 'lib/libc/locale')
-rw-r--r--lib/libc/locale/nl_langinfo.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/lib/libc/locale/nl_langinfo.c b/lib/libc/locale/nl_langinfo.c
index f017d26..e6f3746 100644
--- a/lib/libc/locale/nl_langinfo.c
+++ b/lib/libc/locale/nl_langinfo.c
@@ -44,7 +44,6 @@ nl_langinfo(nl_item item) {
ret = ""; /* XXX: need to be implemented */
break;
case D_T_FMT:
- /* XXX: ???, this is compatibility field for FreeBSD */
ret = (char *) __get_current_time_locale()->c_fmt;
break;
case D_FMT:
@@ -54,8 +53,7 @@ nl_langinfo(nl_item item) {
ret = (char *) __get_current_time_locale()->X_fmt;
break;
case T_FMT_AMPM:
- /* XXX: ??? */
- ret = "";
+ ret = "%r";
break;
case AM_STR:
ret = (char *) __get_current_time_locale()->am;
@@ -101,10 +99,10 @@ nl_langinfo(nl_item item) {
/* XXX: ??? */
ret = "";
break;
- case RADIXCHAR:
+ case RADIXCHAR: /* deprecated */
ret = (char*) __get_current_numeric_locale()->decimal_point;
break;
- case THOUSEP:
+ case THOUSEP: /* deprecated */
ret = (char*) __get_current_numeric_locale()->thousands_sep;
break;
case YESEXPR:
@@ -113,16 +111,15 @@ nl_langinfo(nl_item item) {
case NOEXPR:
ret = (char*) __get_current_messages_locale()->noexpr;
break;
- case YESSTR:
- ret = (char*) __get_current_messages_locale()->yesstr;
- break;
- case NOSTR:
- ret = (char*) __get_current_messages_locale()->nostr;
+ case YESSTR: /* deprecated */
+ ret = "";
break;
- case CRNCYSTR:
- /* XXX: ??? */
+ case NOSTR: /* deprecated */
ret = "";
break;
+ case CRNCYSTR: /* deprecated */
+ ret = (char*) __get_current_monetary_locale()->currency_symbol;
+ break;
default:
ret = "";
}
OpenPOWER on IntegriCloud