. Static'ize functions exported via function reference variables only.

. Replace inclusion of sys/param.h to sys/cdefs.h and sys/types.h where
  appropriate.
. move _*_init() prototypes to mblocal.h, and remove these prototypes
  from .c files
. use _none_init() in __setrunelocale() instead of duplicating code
. move __mb* variables from table.c to none.c allowing us to not to
  export _none_*() externs, and appropriately remove them from mblocal.h

Ok'ed by:	tjr

1 files changed, 12 insertions, 13 deletions

diff --git a/lib/libc/locale/mblocal.h b/lib/libc/locale/mblocal.h
index 9378c0c..e424ebe 100644
--- a/lib/libc/locale/mblocal.h
+++ b/lib/libc/locale/mblocal.h
@@ -30,6 +30,18 @@
 #define	_MBLOCAL_H_
 
 /*
+ * Rune initialization function prototypes.
+ */
+int	_none_init(_RuneLocale *);
+int	_UTF8_init(_RuneLocale *);
+int	_EUC_init(_RuneLocale *);
+int	_GB18030_init(_RuneLocale *);
+int	_GB2312_init(_RuneLocale *);
+int	_GBK_init(_RuneLocale *);
+int	_BIG5_init(_RuneLocale *);
+int	_MSKanji_init(_RuneLocale *);
+
+/*
  * Conversion function pointers for current encoding.
  */
 extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
@@ -41,19 +53,6 @@ extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
 extern size_t (*__wcsnrtombs)(char * __restrict, const wchar_t ** __restrict,
     size_t, size_t, mbstate_t * __restrict);
 
-/*
- * Conversion functions for "NONE"/C/POSIX encoding.
- */
-extern size_t _none_mbrtowc(wchar_t * __restrict, const char * __restrict,
-    size_t, mbstate_t * __restrict);
-extern int _none_mbsinit(const mbstate_t *);
-extern size_t _none_mbsnrtowcs(wchar_t * __restrict, const char ** __restrict,
-    size_t, size_t, mbstate_t * __restrict);
-extern size_t _none_wcrtomb(char * __restrict, wchar_t,
-    mbstate_t * __restrict);
-extern size_t _none_wcsnrtombs(char * __restrict, const wchar_t ** __restrict,
-    size_t, size_t, mbstate_t * __restrict);
-
 extern size_t __mbsnrtowcs_std(wchar_t * __restrict, const char ** __restrict,
     size_t, size_t, mbstate_t * __restrict);
 extern size_t __wcsnrtombs_std(char * __restrict, const wchar_t ** __restrict,