From: John Marino <draco@marino.st>
Date: Sat, 5 Sep 2015 18:33:58 +0000 (+0200)
Subject: Reworked (significantly) symbol map for locales
X-Git-Tag: v4.5.0~610
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/aa9a8ae0e364cb078ce8ebbaafb0e6c11aeebaae

Reworked (significantly) symbol map for locales
---

diff --git a/lib/libc/locale/Symbol.map b/lib/libc/locale/Symbol.map
index 7393ff7d07..a62e5b909a 100644
--- a/lib/libc/locale/Symbol.map
+++ b/lib/libc/locale/Symbol.map
@@ -1,7 +1,4 @@
 DF402.0 {
-	_CurrentRuneLocale;
-	_DefaultRuneLocale;
-	_ThreadRuneLocale;
 	___mb_cur_max;
 	___mb_cur_max_l;
 	___runetype;
@@ -25,10 +22,13 @@ DF402.0 {
 	__sbmaskrune_l;
 	__sbtolower;
 	__sbtoupper;
-	__thread_locale;
 	__tolower;
 	__toupper;
 	__wcwidth;
+	__wcwidth_l;
+	_CurrentRuneLocale;
+	_DefaultRuneLocale;
+	_ThreadRuneLocale;
 	btowc;
 	btowc_l;
 	c16rtomb;
@@ -105,6 +105,8 @@ DF402.0 {
 	iswpunct_l;
 	iswrune;
 	iswrune_l;
+	iswctype;
+	iswctype_l;
 	iswspace;
 	iswspace_l;
 	iswspecial;
@@ -118,8 +120,8 @@ DF402.0 {
 	localeconv;
 	localeconv_l;
 	locale_isstrict;
-	wcrtoutf8;
-	utf8towcr;
+	mbintowcr;
+	mbintowcr_l;
 	mblen;
 	mblen_l;
 	mbrlen;
@@ -148,11 +150,6 @@ DF402.0 {
 	querylocale;
 	rpmatch;
 	setlocale;
-	strcoll_l;
-	strfmon_l;
-	strftime_l;
-	strptime_l;
-	strxfrm_l;
 	toascii;
 	tolower;
 	tolower_l;
@@ -165,9 +162,10 @@ DF402.0 {
 	towupper;
 	towupper_l;
 	uselocale;
+	utf8towcr;
 	wcrtomb;
 	wcrtomb_l;
-	wcscoll_l;
+	wcrtoutf8;
 	wcsftime;
 	wcsftime_l;
 	wcsnrtombs;
@@ -194,7 +192,6 @@ DF402.0 {
 	wcstoull_l;
 	wcstoumax;
 	wcstoumax_l;
-	wcsxfrm_l;
 	wctob;
 	wctob_l;
 	wctomb;
@@ -204,64 +201,10 @@ DF402.0 {
 	wctype;
 	wctype_l;
 	wcwidth;
+	wcwidth_l;
 };
 
+/*
 DFprivate_1.0 {
-    __detect_path_locale;
-    __collate_equiv_value;
-    __collate_load;
-    __collate_load_tables;
-    __collate_range_cmp;
-    __ctype_load;
-    __fix_locale_grouping_str;
-    __get_current_messages_locale;
-    __get_current_monetary_locale;
-    __get_current_numeric_locale;
-    __get_current_time_locale;
-    __get_locale_env;
-    __has_thread_locale;
-    __mbrtowc;
-    __mbsnrtowcs;
-    __mbsnrtowcs_std;
-    __mbsinit;
-    __messages_load;
-    __messages_load_locale;
-    __monetary_load;
-    __monetary_load_locale;
-    __numeric_load;
-    __numeric_load_locale;
-    __part_load_locale;
-    __set_thread_rune_locale;
-    __time_load;
-    __time_load_locale;
-    __xlocale_C_collate;
-    __xlocale_C_ctype;
-    __xlocale_C_locale;
-    __xlocale_global_collate;
-    __xlocale_global_ctype;
-    __xlocale_global_locale;
-    __xlocale_global_messages;
-    __xlocale_global_monetary;
-    __xlocale_global_numeric;
-    __xlocale_global_time;
-    __wcrtomb;
-    __wcsnrtombs;
-    __wcsnrtombs_std;
-    __wcwidth_l;
-    __wrap_setrunelocale;
-    _BIG5_init;
-    _EUC_CN_init;
-    _EUC_JP_init;
-    _EUC_KR_init;
-    _EUC_TW_init;
-    _GB18030_init;
-    _GB2312_init;
-    _GBK_init;
-    _MSKanji_init;
-    _Read_RuneMagi;
-    _UTF8_init;
-    _PathLocale;
-    _none_init;
-    _collate_load_tables_l;
-    _collate_lookup;
 };
+*/
diff --git a/lib/libc/nameser/Symbol.map b/lib/libc/nameser/Symbol.map
index fcbb06ec7b..f97b11a24a 100644
--- a/lib/libc/nameser/Symbol.map
+++ b/lib/libc/nameser/Symbol.map
@@ -1,4 +1,4 @@
-DF402.0 {
+DF404.0 {
     __ns_format_ttl;
     __ns_get16;
     __ns_get32;
diff --git a/lib/libc/string/Symbol.map b/lib/libc/string/Symbol.map
index deb73ee6ec..b06e00ac9e 100644
--- a/lib/libc/string/Symbol.map
+++ b/lib/libc/string/Symbol.map
@@ -86,7 +86,7 @@ DF404.0 {
     wcswidth;
     wcswidth_l;
     wcsxfrm;
-    wcwidth_l;
+    wcsxfrm_l;
     wmemchr;
     wmemcmp;
     wmemcpy;