summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/libc/locale/big5.c6
-rw-r--r--lib/libc/locale/euc.c6
-rw-r--r--lib/libc/locale/gb18030.c6
-rw-r--r--lib/libc/locale/gb2312.c6
-rw-r--r--lib/libc/locale/gbk.c6
-rw-r--r--lib/libc/locale/mblocal.h57
-rw-r--r--lib/libc/locale/mbrtowc.c4
-rw-r--r--lib/libc/locale/mbsinit.c3
-rw-r--r--lib/libc/locale/mskanji.c6
-rw-r--r--lib/libc/locale/none.c6
-rw-r--r--lib/libc/locale/setrunelocale.c13
-rw-r--r--lib/libc/locale/srune.c1
-rw-r--r--lib/libc/locale/table.c8
-rw-r--r--lib/libc/locale/utf2.c6
-rw-r--r--lib/libc/locale/utf8.c6
-rw-r--r--lib/libc/locale/wcrtomb.c3
16 files changed, 72 insertions, 71 deletions
diff --git a/lib/libc/locale/big5.c b/lib/libc/locale/big5.c
index 2f3d5b3..8eb4b52 100644
--- a/lib/libc/locale/big5.c
+++ b/lib/libc/locale/big5.c
@@ -46,11 +46,7 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
-
-extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
- size_t, mbstate_t * __restrict);
-extern int (*__mbsinit)(const mbstate_t *);
-extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
+#include "mblocal.h"
int _BIG5_init(_RuneLocale *);
size_t _BIG5_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
diff --git a/lib/libc/locale/euc.c b/lib/libc/locale/euc.c
index b45aaf6..3ecb633 100644
--- a/lib/libc/locale/euc.c
+++ b/lib/libc/locale/euc.c
@@ -47,11 +47,7 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
-
-extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
- size_t, mbstate_t * __restrict);
-extern int (*__mbsinit)(const mbstate_t *);
-extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
+#include "mblocal.h"
int _EUC_init(_RuneLocale *);
size_t _EUC_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
diff --git a/lib/libc/locale/gb18030.c b/lib/libc/locale/gb18030.c
index 30d9e47..5542f6c 100644
--- a/lib/libc/locale/gb18030.c
+++ b/lib/libc/locale/gb18030.c
@@ -37,11 +37,7 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
-
-extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
- size_t, mbstate_t * __restrict);
-extern int (*__mbsinit)(const mbstate_t *);
-extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
+#include "mblocal.h"
int _GB18030_init(_RuneLocale *);
size_t _GB18030_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
diff --git a/lib/libc/locale/gb2312.c b/lib/libc/locale/gb2312.c
index 36f6e09..e30755b 100644
--- a/lib/libc/locale/gb2312.c
+++ b/lib/libc/locale/gb2312.c
@@ -33,11 +33,7 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
-
-extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
- size_t, mbstate_t * __restrict);
-extern int (*__mbsinit)(const mbstate_t *);
-extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
+#include "mblocal.h"
int _GB2312_init(_RuneLocale *);
size_t _GB2312_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
diff --git a/lib/libc/locale/gbk.c b/lib/libc/locale/gbk.c
index 3d061f3..2038720 100644
--- a/lib/libc/locale/gbk.c
+++ b/lib/libc/locale/gbk.c
@@ -43,11 +43,7 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
-
-extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
- size_t, mbstate_t * __restrict);
-extern int (*__mbsinit)(const mbstate_t *);
-extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
+#include "mblocal.h"
int _GBK_init(_RuneLocale *);
size_t _GBK_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
diff --git a/lib/libc/locale/mblocal.h b/lib/libc/locale/mblocal.h
new file mode 100644
index 0000000..c428704
--- /dev/null
+++ b/lib/libc/locale/mblocal.h
@@ -0,0 +1,57 @@
+/*-
+ * Copyright (c) 2004 Tim J. Robbins.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _MBLOCAL_H_
+#define _MBLOCAL_H_
+
+#include <stddef.h> /* XXX for rune_t */
+
+/*
+ * Conversion function pointers for current encoding.
+ */
+extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
+ size_t, mbstate_t * __restrict);
+extern int (*__mbsinit)(const mbstate_t *);
+extern size_t (*__wcrtomb)(char * __restrict, wchar_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_wcrtomb(char * __restrict, wchar_t,
+ mbstate_t * __restrict);
+
+/*
+ * Rune emulation functions.
+ */
+extern rune_t __emulated_sgetrune(const char *, size_t, const char **);
+extern int __emulated_sputrune(rune_t, char *, size_t, char **);
+
+#endif /* _MBLOCAL_H_ */
diff --git a/lib/libc/locale/mbrtowc.c b/lib/libc/locale/mbrtowc.c
index 22a9041..42d5f7a 100644
--- a/lib/libc/locale/mbrtowc.c
+++ b/lib/libc/locale/mbrtowc.c
@@ -28,9 +28,7 @@
__FBSDID("$FreeBSD$");
#include <wchar.h>
-
-extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
- size_t, mbstate_t * __restrict);
+#include "mblocal.h"
size_t
mbrtowc(wchar_t * __restrict pwc, const char * __restrict s,
diff --git a/lib/libc/locale/mbsinit.c b/lib/libc/locale/mbsinit.c
index 5470789..24408c7 100644
--- a/lib/libc/locale/mbsinit.c
+++ b/lib/libc/locale/mbsinit.c
@@ -28,8 +28,7 @@
__FBSDID("$FreeBSD$");
#include <wchar.h>
-
-extern int (*__mbsinit)(const mbstate_t *);
+#include "mblocal.h"
int
mbsinit(const mbstate_t *ps)
diff --git a/lib/libc/locale/mskanji.c b/lib/libc/locale/mskanji.c
index 0798e89..60b1c39 100644
--- a/lib/libc/locale/mskanji.c
+++ b/lib/libc/locale/mskanji.c
@@ -44,11 +44,7 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
-
-extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
- size_t, mbstate_t * __restrict);
-extern int (*__mbsinit)(const mbstate_t *);
-extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
+#include "mblocal.h"
int _MSKanji_init(_RuneLocale *);
size_t _MSKanji_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
diff --git a/lib/libc/locale/none.c b/lib/libc/locale/none.c
index a94d040..c8b3874 100644
--- a/lib/libc/locale/none.c
+++ b/lib/libc/locale/none.c
@@ -48,11 +48,7 @@ __FBSDID("$FreeBSD$");
#include <stdio.h>
#include <stdlib.h>
#include <wchar.h>
-
-extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
- size_t, mbstate_t * __restrict);
-extern int (*__mbsinit)(const mbstate_t *);
-extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
+#include "mblocal.h"
int _none_init(_RuneLocale *);
size_t _none_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
diff --git a/lib/libc/locale/setrunelocale.c b/lib/libc/locale/setrunelocale.c
index 0d11893..4055ffe 100644
--- a/lib/libc/locale/setrunelocale.c
+++ b/lib/libc/locale/setrunelocale.c
@@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
#include <unistd.h>
#include <wchar.h>
#include "ldpart.h"
+#include "mblocal.h"
#include "setlocale.h"
extern int _none_init(_RuneLocale *);
@@ -62,18 +63,6 @@ extern int _BIG5_init(_RuneLocale *);
extern int _MSKanji_init(_RuneLocale *);
extern _RuneLocale *_Read_RuneMagi(FILE *);
-extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
- size_t, mbstate_t * __restrict);
-extern int (*__mbsinit)(const mbstate_t *);
-extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
-extern rune_t __emulated_sgetrune(const char *, size_t, const char **);
-extern int __emulated_sputrune(rune_t, char *, size_t, char **);
-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_wcrtomb(char * __restrict, wchar_t,
- mbstate_t * __restrict);
-
static int __setrunelocale(const char *);
__warn_references(setrunelocale, "warning: setrunelocale() is deprecated. See setrunelocale(3).");
diff --git a/lib/libc/locale/srune.c b/lib/libc/locale/srune.c
index 67d3a39..bb9326f 100644
--- a/lib/libc/locale/srune.c
+++ b/lib/libc/locale/srune.c
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
#include <rune.h>
#include <string.h>
#include <wchar.h>
+#include "mblocal.h"
/*
* Emulate the deprecated 4.4BSD sgetrune() function in terms of
diff --git a/lib/libc/locale/table.c b/lib/libc/locale/table.c
index 7680b9c..f8b8497 100644
--- a/lib/libc/locale/table.c
+++ b/lib/libc/locale/table.c
@@ -43,13 +43,7 @@ __FBSDID("$FreeBSD$");
#include <ctype.h>
#include <rune.h>
#include <wchar.h>
-
-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_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict);
-extern rune_t __emulated_sgetrune(const char *, size_t, const char **);
-extern int __emulated_sputrune(rune_t, char *, size_t, char **);
+#include "mblocal.h"
_RuneLocale _DefaultRuneLocale = {
_RUNE_MAGIC_1,
diff --git a/lib/libc/locale/utf2.c b/lib/libc/locale/utf2.c
index 393a808..cf0e3c8 100644
--- a/lib/libc/locale/utf2.c
+++ b/lib/libc/locale/utf2.c
@@ -44,11 +44,7 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
-
-extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
- size_t, mbstate_t * __restrict);
-extern int (*__mbsinit)(const mbstate_t *);
-extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
+#include "mblocal.h"
size_t _UTF2_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
mbstate_t * __restrict);
diff --git a/lib/libc/locale/utf8.c b/lib/libc/locale/utf8.c
index 7585f50..d754a19 100644
--- a/lib/libc/locale/utf8.c
+++ b/lib/libc/locale/utf8.c
@@ -32,11 +32,7 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
-
-extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
- size_t, mbstate_t * __restrict);
-extern int (*__mbsinit)(const mbstate_t *);
-extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
+#include "mblocal.h"
size_t _UTF8_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
mbstate_t * __restrict);
diff --git a/lib/libc/locale/wcrtomb.c b/lib/libc/locale/wcrtomb.c
index 5f79949..ef75b78 100644
--- a/lib/libc/locale/wcrtomb.c
+++ b/lib/libc/locale/wcrtomb.c
@@ -28,8 +28,7 @@
__FBSDID("$FreeBSD$");
#include <wchar.h>
-
-extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
+#include "mblocal.h"
size_t
wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
OpenPOWER on IntegriCloud