consolidate *_l ctype/wctype functions into their non-_l source files

the main practical purposes of this commit are to remove a huge amount
of clutter from the src/locale directory, to cut down on the length of
the $(AR) and $(LD) command lines, and to reduce the amount of space
wasted by object file headers in the static libc.a. build time may
also be reduced, though this has not been measured.

as an additional justification, if there ever were a need for the
behavior of these functions to vary by locale, it would be necessary
for the non-_l versions to call the _l versions, so that linking the
former without the latter would not be possible anyway.

diff --git a/src/ctype/isalnum.c b/src/ctype/isalnum.c
index e3d2cf0b4ee323a80ca83997ecd06db440af949e..2214936f2bde5d9fd897fc80cba7d35bcb631433 100644 (file)
--- a/src/ctype/isalnum.c
+++ b/src/ctype/isalnum.c
@@ -1,6 +1,14 @@
 #include <ctype.h>
+#include "libc.h"
 
 int isalnum(int c)
 {
        return isalpha(c) || isdigit(c);
 }
+
+int __isalnum_l(int c, locale_t l)
+{
+       return isalnum(c);
+}
+
+weak_alias(__isalnum_l, isalnum_l);

diff --git a/src/ctype/isalpha.c b/src/ctype/isalpha.c
index 53e115c29df71f92c4f627a67ef3bee99cb1e029..f155d3aa97048880a109a8838b79be1e946e2dc2 100644 (file)
--- a/src/ctype/isalpha.c
+++ b/src/ctype/isalpha.c
@@ -1,7 +1,15 @@
 #include <ctype.h>
+#include "libc.h"
 #undef isalpha
 
 int isalpha(int c)
 {
        return ((unsigned)c|32)-'a' < 26;
 }
+
+int __isalpha_l(int c, locale_t l)
+{
+       return isalpha(c);
+}
+
+weak_alias(__isalpha_l, isalpha_l);

diff --git a/src/ctype/isblank.c b/src/ctype/isblank.c
index 957400b2bbe2ad78bd2372e741c4747970195dad..299120e96df19f4f1ad17ced9d45cb68c423b0d0 100644 (file)
--- a/src/ctype/isblank.c
+++ b/src/ctype/isblank.c
@@ -1,6 +1,14 @@
 #include <ctype.h>
+#include "libc.h"
 
 int isblank(int c)
 {
        return (c == ' ' || c == '\t');
 }
+
+int __isblank_l(int c, locale_t l)
+{
+       return isblank(c);
+}
+
+weak_alias(__isblank_l, isblank_l);

diff --git a/src/ctype/iscntrl.c b/src/ctype/iscntrl.c
index 92ed7f0e9adcbf54089676429fd071cfd261b80a..cb4114a0602083f444b364461ebd6d91a0df8566 100644 (file)
--- a/src/ctype/iscntrl.c
+++ b/src/ctype/iscntrl.c
@@ -1,6 +1,14 @@
 #include <ctype.h>
+#include "libc.h"
 
 int iscntrl(int c)
 {
        return (unsigned)c < 0x20 || c == 0x7f;
 }
+
+int __iscntrl_l(int c, locale_t l)
+{
+       return iscntrl(c);
+}
+
+weak_alias(__iscntrl_l, iscntrl_l);

diff --git a/src/ctype/isdigit.c b/src/ctype/isdigit.c
index 0bc82a6d76d8e4ab571a7dfaf27a359bae507b20..4d8a103e612e27d2d394d767d9e20c13aea3435c 100644 (file)
--- a/src/ctype/isdigit.c
+++ b/src/ctype/isdigit.c
@@ -1,7 +1,15 @@
 #include <ctype.h>
+#include "libc.h"
 #undef isdigit
 
 int isdigit(int c)
 {
        return (unsigned)c-'0' < 10;
 }
+
+int __isdigit_l(int c, locale_t l)
+{
+       return isdigit(c);
+}
+
+weak_alias(__isdigit_l, isdigit_l);

diff --git a/src/ctype/isgraph.c b/src/ctype/isgraph.c
index 98979d1e898b996d1ab17b8fcdb92d3c56a269a3..a0aae08aabe69ae9eb70d832be044838d954cb7e 100644 (file)
--- a/src/ctype/isgraph.c
+++ b/src/ctype/isgraph.c
@@ -1,4 +1,15 @@
+#include <ctype.h>
+#include "libc.h"
+#undef isgraph
+
 int isgraph(int c)
 {
        return (unsigned)c-0x21 < 0x5e;
 }
+
+int __isgraph_l(int c, locale_t l)
+{
+       return isgraph(c);
+}
+
+weak_alias(__isgraph_l, isgraph_l);

diff --git a/src/ctype/islower.c b/src/ctype/islower.c
index d72fb212f24599cb37efd99915ce091abb838787..02640213e5f65bb50fb0eff0a067baca9b814794 100644 (file)
--- a/src/ctype/islower.c
+++ b/src/ctype/islower.c
@@ -1,7 +1,15 @@
 #include <ctype.h>
+#include "libc.h"
 #undef islower
 
 int islower(int c)
 {
        return (unsigned)c-'a' < 26;
 }
+
+int __islower_l(int c, locale_t l)
+{
+       return islower(c);
+}
+
+weak_alias(__islower_l, islower_l);

diff --git a/src/ctype/isprint.c b/src/ctype/isprint.c
index 504e66ed127f7d1f0cc5a9ca7456e45bf6283a9f..067275fa03e795ca0603ea1c99239265305c7dc9 100644 (file)
--- a/src/ctype/isprint.c
+++ b/src/ctype/isprint.c
@@ -1,4 +1,15 @@
+#include <ctype.h>
+#include "libc.h"
+#undef isprint
+
 int isprint(int c)
 {
        return (unsigned)c-0x20 < 0x5f;
 }
+
+int __isprint_l(int c, locale_t l)
+{
+       return isprint(c);
+}
+
+weak_alias(__isprint_l, isprint_l);

diff --git a/src/ctype/ispunct.c b/src/ctype/ispunct.c
index fc455352b51480be0966252ace0431fe89ea525e..e772d76a03f20493552beacfadec2844f9452987 100644 (file)
--- a/src/ctype/ispunct.c
+++ b/src/ctype/ispunct.c
@@ -1,6 +1,14 @@
 #include <ctype.h>
+#include "libc.h"
 
 int ispunct(int c)
 {
        return isgraph(c) && !isalnum(c);
 }
+
+int __ispunct_l(int c, locale_t l)
+{
+       return ispunct(c);
+}
+
+weak_alias(__ispunct_l, ispunct_l);

diff --git a/src/ctype/isspace.c b/src/ctype/isspace.c
index 8e535aa1dc59ef335ee5423ece462d3369373eb0..7dff20d047e0d2d872dd0d1265e78ea13d68c9c3 100644 (file)
--- a/src/ctype/isspace.c
+++ b/src/ctype/isspace.c
@@ -1,6 +1,14 @@
 #include <ctype.h>
+#include "libc.h"
 
 int isspace(int c)
 {
        return c == ' ' || (unsigned)c-'\t' < 5;
 }
+
+int __isspace_l(int c, locale_t l)
+{
+       return isspace(c);
+}
+
+weak_alias(__isspace_l, isspace_l);

diff --git a/src/ctype/isupper.c b/src/ctype/isupper.c
index f09d88c57c34a7ae22d57d761463ad506298002d..68c36f4a424f25c57651007adda7f84d1563c9a1 100644 (file)
--- a/src/ctype/isupper.c
+++ b/src/ctype/isupper.c
@@ -1,7 +1,15 @@
 #include <ctype.h>
+#include "libc.h"
 #undef isupper
 
 int isupper(int c)
 {
        return (unsigned)c-'A' < 26;
 }
+
+int __isupper_l(int c, locale_t l)
+{
+       return isupper(c);
+}
+
+weak_alias(__isupper_l, isupper_l);

diff --git a/src/ctype/iswalnum.c b/src/ctype/iswalnum.c
index 35dbe02cf3cb3993e701c3acf8f950db101a890c..a6082da4378676145a41d90ddf4ef9935c3fabc9 100644 (file)
--- a/src/ctype/iswalnum.c
+++ b/src/ctype/iswalnum.c
@@ -1,7 +1,14 @@
-#include <wchar.h>
 #include <wctype.h>
+#include "libc.h"
 
 int iswalnum(wint_t wc)
 {
        return iswdigit(wc) || iswalpha(wc);
 }
+
+int __iswalnum_l(wint_t c, locale_t l)
+{
+       return iswalnum(c);
+}
+
+weak_alias(__iswalnum_l, iswalnum_l);

diff --git a/src/ctype/iswalpha.c b/src/ctype/iswalpha.c
index d558faef47954bdc2ba7f84957e73fe969c31233..00f9d81f5a7899d4748d35457928e5d2a342d5c8 100644 (file)
--- a/src/ctype/iswalpha.c
+++ b/src/ctype/iswalpha.c
@@ -1,4 +1,5 @@
 #include <wctype.h>
+#include "libc.h"
 
 static const unsigned char table[] = {
 #include "alpha.h"
@@ -12,3 +13,10 @@ int iswalpha(wint_t wc)
                return 1;
        return 0;
 }
+
+int __iswalpha_l(wint_t c, locale_t l)
+{
+       return iswalpha(c);
+}
+
+weak_alias(__iswalpha_l, iswalpha_l);

diff --git a/src/ctype/iswblank.c b/src/ctype/iswblank.c
index bc6196f290f9a4c0174cd11cdb70193c9c849fd1..d9b33ef472d64366f1338fcc0caeb6318fea1f11 100644 (file)
--- a/src/ctype/iswblank.c
+++ b/src/ctype/iswblank.c
@@ -1,8 +1,15 @@
-#include <wchar.h>
 #include <wctype.h>
 #include <ctype.h>
+#include "libc.h"
 
 int iswblank(wint_t wc)
 {
        return isblank(wc);
 }
+
+int __iswblank_l(wint_t c, locale_t l)
+{
+       return iswblank(c);
+}
+
+weak_alias(__iswblank_l, iswblank_l);

diff --git a/src/ctype/iswcntrl.c b/src/ctype/iswcntrl.c
index 93942b0874c5e9a0715646ad4be2cc7cd0cdcc14..daace82a375f46080c1de6c7058a81f29c9b47c7 100644 (file)
--- a/src/ctype/iswcntrl.c
+++ b/src/ctype/iswcntrl.c
@@ -1,5 +1,5 @@
-#include <wchar.h>
 #include <wctype.h>
+#include "libc.h"
 
 int iswcntrl(wint_t wc)
 {
@@ -8,3 +8,10 @@ int iswcntrl(wint_t wc)
            || (unsigned)(wc-0x2028) < 2
            || (unsigned)(wc-0xfff9) < 3;
 }
+
+int __iswcntrl_l(wint_t c, locale_t l)
+{
+       return iswcntrl(c);
+}
+
+weak_alias(__iswcntrl_l, iswcntrl_l);

diff --git a/src/ctype/iswctype.c b/src/ctype/iswctype.c
index d917975b90a2a39d8f12e777ef5f3aecd825f323..3d9c2cc7c2d0703e51f77aa1e6d71f256d2a03a6 100644 (file)
--- a/src/ctype/iswctype.c
+++ b/src/ctype/iswctype.c
@@ -1,6 +1,6 @@
-#include <wchar.h>
 #include <wctype.h>
 #include <string.h>
+#include "libc.h"
 
 #define WCTYPE_ALNUM  1
 #define WCTYPE_ALPHA  2
@@ -61,3 +61,16 @@ wctype_t wctype(const char *s)
                        return i;
        return 0;
 }
+
+int __iswctype_l(wint_t c, wctype_t t, locale_t l)
+{
+       return iswctype(c, t);
+}
+
+wctype_t __wctype_l(const char *s, locale_t l)
+{
+       return wctype(s);
+}
+
+weak_alias(__iswctype_l, iswctype_l);
+weak_alias(__wctype_l, wctype_l);

diff --git a/src/ctype/iswdigit.c b/src/ctype/iswdigit.c
index 0487145fabb17d22ab53eb5c0ba0d1375350a27c..ed9a88e740ad38a7bf60bed9d52ebbc23161c978 100644 (file)
--- a/src/ctype/iswdigit.c
+++ b/src/ctype/iswdigit.c
@@ -1,5 +1,5 @@
-#include <wchar.h>
 #include <wctype.h>
+#include "libc.h"
 
 #undef iswdigit
 
@@ -7,3 +7,10 @@ int iswdigit(wint_t wc)
 {
        return (unsigned)wc-'0' < 10;
 }
+
+int __iswdigit_l(wint_t c, locale_t l)
+{
+       return iswdigit(c);
+}
+
+weak_alias(__iswdigit_l, iswdigit_l);

diff --git a/src/ctype/iswgraph.c b/src/ctype/iswgraph.c
index fdc978535b1e7ab0fdc5e0c7f3d9c6befd8c855c..0ea5ca3a4d57ea52c08ea53ea78df5e6b17c00d9 100644 (file)
--- a/src/ctype/iswgraph.c
+++ b/src/ctype/iswgraph.c
@@ -1,7 +1,15 @@
 #include <wctype.h>
+#include "libc.h"
 
 int iswgraph(wint_t wc)
 {
        /* ISO C defines this function as: */
        return !iswspace(wc) && iswprint(wc);
 }
+
+int __iswgraph_l(wint_t c, locale_t l)
+{
+       return iswgraph(c);
+}
+
+weak_alias(__iswgraph_l, iswgraph_l);

diff --git a/src/ctype/iswlower.c b/src/ctype/iswlower.c
index 438fe26a5dac1de1a3a2c8fedd9f13c436928d26..c754fb955b02336bd874c3f5f39cb74dc1e2aaca 100644 (file)
--- a/src/ctype/iswlower.c
+++ b/src/ctype/iswlower.c
@@ -1,6 +1,14 @@
 #include <wctype.h>
+#include "libc.h"
 
 int iswlower(wint_t wc)
 {
        return towupper(wc) != wc || wc == 0xdf;
 }
+
+int __iswlower_l(wint_t c, locale_t l)
+{
+       return iswlower(c);
+}
+
+weak_alias(__iswlower_l, iswlower_l);

diff --git a/src/ctype/iswprint.c b/src/ctype/iswprint.c
index 333f19c2b272a86533fb5fd67b58d6af051b1c6c..69856e0d8e3a3e98dec528bae17cd7da8456704b 100644 (file)
--- a/src/ctype/iswprint.c
+++ b/src/ctype/iswprint.c
@@ -1,4 +1,5 @@
 #include <wctype.h>
+#include "libc.h"
 
 /* Consider all legal codepoints as printable except for:
  * - C0 and C1 control characters
@@ -17,3 +18,10 @@ int iswprint(wint_t wc)
                return 0;
        return 1;
 }
+
+int __iswprint_l(wint_t c, locale_t l)
+{
+       return iswprint(c);
+}
+
+weak_alias(__iswprint_l, iswprint_l);

diff --git a/src/ctype/iswpunct.c b/src/ctype/iswpunct.c
index 16e8703b55cdcbd5b252f77f93baf8fa0331ff8b..d88010463c9f8d481c2d55e0d25b8d0898a608b4 100644 (file)
--- a/src/ctype/iswpunct.c
+++ b/src/ctype/iswpunct.c
@@ -1,4 +1,5 @@
 #include <wctype.h>
+#include "libc.h"
 
 static const unsigned char table[] = {
 #include "punct.h"
@@ -10,3 +11,10 @@ int iswpunct(wint_t wc)
                return (table[table[wc>>8]*32+((wc&255)>>3)]>>(wc&7))&1;
        return 0;
 }
+
+int __iswpunct_l(wint_t c, locale_t l)
+{
+       return iswpunct(c);
+}
+
+weak_alias(__iswpunct_l, iswpunct_l);

diff --git a/src/ctype/iswspace.c b/src/ctype/iswspace.c
index b0c0ae18cf225820891b050082b12266d135374f..75ae7e8ee3657076b52e96704cec775942447115 100644 (file)
--- a/src/ctype/iswspace.c
+++ b/src/ctype/iswspace.c
@@ -1,6 +1,6 @@
 #include <wchar.h>
 #include <wctype.h>
-#include <ctype.h>
+#include "libc.h"
 
 /* Our definition of whitespace is the Unicode White_Space property,
  * minus non-breaking spaces (U+00A0, U+2007, and U+202F) and script-
@@ -16,3 +16,10 @@ int iswspace(wint_t wc)
        };
        return wc && wcschr(spaces, wc);
 }
+
+int __iswspace_l(wint_t c, locale_t l)
+{
+       return iswspace(c);
+}
+
+weak_alias(__iswspace_l, iswspace_l);

diff --git a/src/ctype/iswupper.c b/src/ctype/iswupper.c
index eae59a75d9419bb07a37f057c6e06d4d5e6c28b6..6e1e029c4902936cc38a3bfba5b22d7d68d84ffc 100644 (file)
--- a/src/ctype/iswupper.c
+++ b/src/ctype/iswupper.c
@@ -1,6 +1,14 @@
 #include <wctype.h>
+#include "libc.h"
 
 int iswupper(wint_t wc)
 {
        return towlower(wc) != wc;
 }
+
+int __iswupper_l(wint_t c, locale_t l)
+{
+       return iswupper(c);
+}
+
+weak_alias(__iswupper_l, iswupper_l);

diff --git a/src/ctype/iswxdigit.c b/src/ctype/iswxdigit.c
index 229a469f028e991fd3f74a220d31d01dee857d60..1e27f1f0f9d82dc1b70d6d65ec917358dedf839d 100644 (file)
--- a/src/ctype/iswxdigit.c
+++ b/src/ctype/iswxdigit.c
@@ -1,7 +1,14 @@
-#include <wchar.h>
 #include <wctype.h>
+#include "libc.h"
 
 int iswxdigit(wint_t wc)
 {
        return (unsigned)(wc-'0') < 10 || (unsigned)((wc|32)-'a') < 6;
 }
+
+int __iswxdigit_l(wint_t c, locale_t l)
+{
+       return iswxdigit(c);
+}
+
+weak_alias(__iswxdigit_l, iswxdigit_l);

diff --git a/src/ctype/isxdigit.c b/src/ctype/isxdigit.c
index ae68a3dc9249b22a8862b60a3ccdd39a3fe1ddda..0e9152a7b01661b08167eb8169518c8536092051 100644 (file)
--- a/src/ctype/isxdigit.c
+++ b/src/ctype/isxdigit.c
@@ -1,6 +1,14 @@
 #include <ctype.h>
+#include "libc.h"
 
 int isxdigit(int c)
 {
        return isdigit(c) || ((unsigned)c|32)-'a' < 6;
 }
+
+int __isxdigit_l(int c, locale_t l)
+{
+       return isxdigit(c);
+}
+
+weak_alias(__isxdigit_l, isxdigit_l);

diff --git a/src/ctype/tolower.c b/src/ctype/tolower.c
index b56f3c5094a2441649fddb796e590708bdc2a20b..362d6b2becdebbae8c123de7a3f580abe8536c02 100644 (file)
--- a/src/ctype/tolower.c
+++ b/src/ctype/tolower.c
@@ -1,7 +1,15 @@
 #include <ctype.h>
+#include "libc.h"
 
 int tolower(int c)
 {
        if (isupper(c)) return c | 32;
        return c;
 }
+
+int __tolower_l(int c, locale_t l)
+{
+       return tolower(c);
+}
+
+weak_alias(__tolower_l, tolower_l);

diff --git a/src/ctype/toupper.c b/src/ctype/toupper.c
index 1799f0307789a3336b28d82e78203a0482eb02ea..bbf4e06e815c6e1bbd7bfce3f12e471d427d71ad 100644 (file)
--- a/src/ctype/toupper.c
+++ b/src/ctype/toupper.c
@@ -1,7 +1,15 @@
 #include <ctype.h>
+#include "libc.h"
 
 int toupper(int c)
 {
        if (islower(c)) return c & 0x5f;
        return c;
 }
+
+int __toupper_l(int c, locale_t l)
+{
+       return toupper(c);
+}
+
+weak_alias(__toupper_l, toupper_l);

diff --git a/src/ctype/towctrans.c b/src/ctype/towctrans.c
index 2842d690e7dfbe35c1a6088b5d9d0bac366d6648..5e0889b1c7eb04745da2c0fe8877484af6b3073f 100644 (file)
--- a/src/ctype/towctrans.c
+++ b/src/ctype/towctrans.c
@@ -1,6 +1,5 @@
-#include <wchar.h>
 #include <wctype.h>
-#include <stdio.h>
+#include "libc.h"
 
 #define CASEMAP(u1,u2,l) { (u1), (l)-(u1), (u2)-(u1)+1 }
 #define CASELACE(u1,u2) CASEMAP((u1),(u2),(u1)+1)
@@ -266,3 +265,16 @@ wint_t towlower(wint_t wc)
 {
        return __towcase(wc, 1);
 }
+
+wint_t __towupper_l(wint_t c, locale_t l)
+{
+       return towupper(c);
+}
+
+wint_t __towlower_l(wint_t c, locale_t l)
+{
+       return towlower(c);
+}
+
+weak_alias(__towupper_l, towupper_l);
+weak_alias(__towlower_l, towlower_l);

diff --git a/src/ctype/wctrans.c b/src/ctype/wctrans.c
index 739869d059e4aec9b2f805cdc95d5c703dd711ca..b1b1265481c7d2714365537575b2d8152d033d17 100644 (file)
--- a/src/ctype/wctrans.c
+++ b/src/ctype/wctrans.c
@@ -1,5 +1,6 @@
 #include <wctype.h>
 #include <string.h>
+#include "libc.h"
 
 wctrans_t wctrans(const char *class)
 {
@@ -14,3 +15,16 @@ wint_t towctrans(wint_t wc, wctrans_t trans)
        if (trans == (wctrans_t)2) return towlower(wc);
        return wc;
 }
+
+wctrans_t __wctrans_l(const char *s, locale_t l)
+{
+       return wctrans(s);
+}
+
+wint_t __towctrans_l(wint_t c, wctrans_t t, locale_t l)
+{
+       return towctrans(c, t);
+}
+
+weak_alias(__wctrans_l, wctrans_l);
+weak_alias(__towctrans_l, towctrans_l);

diff --git a/src/locale/isalnum_l.c b/src/locale/isalnum_l.c
deleted file mode 100644 (file)
index b8a6eef..0000000
--- a/src/locale/isalnum_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <ctype.h>
-
-int isalnum_l(int c, locale_t l)
-{
-       return isalnum(c);
-}

diff --git a/src/locale/isalpha_l.c b/src/locale/isalpha_l.c
deleted file mode 100644 (file)
index 2e1205c..0000000
--- a/src/locale/isalpha_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <ctype.h>
-
-int isalpha_l(int c, locale_t l)
-{
-       return isalpha(c);
-}

diff --git a/src/locale/isblank_l.c b/src/locale/isblank_l.c
deleted file mode 100644 (file)
index 27479aa..0000000
--- a/src/locale/isblank_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <ctype.h>
-
-int isblank_l(int c, locale_t l)
-{
-       return isblank(c);
-}

diff --git a/src/locale/iscntrl_l.c b/src/locale/iscntrl_l.c
deleted file mode 100644 (file)
index ca596fa..0000000
--- a/src/locale/iscntrl_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <ctype.h>
-
-int iscntrl_l(int c, locale_t l)
-{
-       return iscntrl(c);
-}

diff --git a/src/locale/isdigit_l.c b/src/locale/isdigit_l.c
deleted file mode 100644 (file)
index c8ae7bd..0000000
--- a/src/locale/isdigit_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <ctype.h>
-
-int isdigit_l(int c, locale_t l)
-{
-       return isdigit(c);
-}

diff --git a/src/locale/isgraph_l.c b/src/locale/isgraph_l.c
deleted file mode 100644 (file)
index 713a86e..0000000
--- a/src/locale/isgraph_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <ctype.h>
-
-int isgraph_l(int c, locale_t l)
-{
-       return isgraph(c);
-}

diff --git a/src/locale/islower_l.c b/src/locale/islower_l.c
deleted file mode 100644 (file)
index 25ec97a..0000000
--- a/src/locale/islower_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <ctype.h>
-
-int islower_l(int c, locale_t l)
-{
-       return islower(c);
-}

diff --git a/src/locale/isprint_l.c b/src/locale/isprint_l.c
deleted file mode 100644 (file)
index 79ef351..0000000
--- a/src/locale/isprint_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <ctype.h>
-
-int isprint_l(int c, locale_t l)
-{
-       return isprint(c);
-}

diff --git a/src/locale/ispunct_l.c b/src/locale/ispunct_l.c
deleted file mode 100644 (file)
index 1c0bd04..0000000
--- a/src/locale/ispunct_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <ctype.h>
-
-int ispunct_l(int c, locale_t l)
-{
-       return ispunct(c);
-}

diff --git a/src/locale/isspace_l.c b/src/locale/isspace_l.c
deleted file mode 100644 (file)
index e1a0efe..0000000
--- a/src/locale/isspace_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <ctype.h>
-
-int isspace_l(int c, locale_t l)
-{
-       return isspace(c);
-}

diff --git a/src/locale/isupper_l.c b/src/locale/isupper_l.c
deleted file mode 100644 (file)
index 11ba703..0000000
--- a/src/locale/isupper_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <ctype.h>
-
-int isupper_l(int c, locale_t l)
-{
-       return isupper(c);
-}

diff --git a/src/locale/iswalnum_l.c b/src/locale/iswalnum_l.c
deleted file mode 100644 (file)
index c888060..0000000
--- a/src/locale/iswalnum_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <wctype.h>
-
-int iswalnum_l(wint_t c, locale_t l)
-{
-       return iswalnum(c);
-}

diff --git a/src/locale/iswalpha_l.c b/src/locale/iswalpha_l.c
deleted file mode 100644 (file)
index cd2be91..0000000
--- a/src/locale/iswalpha_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <wctype.h>
-
-int iswalpha_l(wint_t c, locale_t l)
-{
-       return iswalpha(c);
-}

diff --git a/src/locale/iswblank_l.c b/src/locale/iswblank_l.c
deleted file mode 100644 (file)
index f3a2691..0000000
--- a/src/locale/iswblank_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <wctype.h>
-
-int iswblank_l(wint_t c, locale_t l)
-{
-       return iswblank(c);
-}

diff --git a/src/locale/iswcntrl_l.c b/src/locale/iswcntrl_l.c
deleted file mode 100644 (file)
index 7681fe0..0000000
--- a/src/locale/iswcntrl_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <wctype.h>
-
-int iswcntrl_l(wint_t c, locale_t l)
-{
-       return iswcntrl(c);
-}

diff --git a/src/locale/iswctype_l.c b/src/locale/iswctype_l.c
deleted file mode 100644 (file)
index 13dfb1e..0000000
--- a/src/locale/iswctype_l.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <wctype.h>
-#include "libc.h"
-
-int iswctype_l(wint_t c, wctype_t t, locale_t l)
-{
-       return iswctype(c, t);
-}
-
-weak_alias(iswctype_l, __iswctype_l);

diff --git a/src/locale/iswdigit_l.c b/src/locale/iswdigit_l.c
deleted file mode 100644 (file)
index 3de678c..0000000
--- a/src/locale/iswdigit_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <wctype.h>
-
-int iswdigit_l(wint_t c, locale_t l)
-{
-       return iswdigit(c);
-}

diff --git a/src/locale/iswgraph_l.c b/src/locale/iswgraph_l.c
deleted file mode 100644 (file)
index 34df64f..0000000
--- a/src/locale/iswgraph_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <wctype.h>
-
-int iswgraph_l(wint_t c, locale_t l)
-{
-       return iswgraph(c);
-}

diff --git a/src/locale/iswlower_l.c b/src/locale/iswlower_l.c
deleted file mode 100644 (file)
index c52421a..0000000
--- a/src/locale/iswlower_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <wctype.h>
-
-int iswlower_l(wint_t c, locale_t l)
-{
-       return iswlower(c);
-}

diff --git a/src/locale/iswprint_l.c b/src/locale/iswprint_l.c
deleted file mode 100644 (file)
index 73d83ab..0000000
--- a/src/locale/iswprint_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <wctype.h>
-
-int iswprint_l(wint_t c, locale_t l)
-{
-       return iswprint(c);
-}

diff --git a/src/locale/iswpunct_l.c b/src/locale/iswpunct_l.c
deleted file mode 100644 (file)
index 831e0e5..0000000
--- a/src/locale/iswpunct_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <wctype.h>
-
-int iswpunct_l(wint_t c, locale_t l)
-{
-       return iswpunct(c);
-}

diff --git a/src/locale/iswspace_l.c b/src/locale/iswspace_l.c
deleted file mode 100644 (file)
index b507e9e..0000000
--- a/src/locale/iswspace_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <wctype.h>
-
-int iswspace_l(wint_t c, locale_t l)
-{
-       return iswspace(c);
-}

diff --git a/src/locale/iswupper_l.c b/src/locale/iswupper_l.c
deleted file mode 100644 (file)
index fc988ef..0000000
--- a/src/locale/iswupper_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <wctype.h>
-
-int iswupper_l(wint_t c, locale_t l)
-{
-       return iswupper(c);
-}

diff --git a/src/locale/iswxdigit_l.c b/src/locale/iswxdigit_l.c
deleted file mode 100644 (file)
index 9527cf3..0000000
--- a/src/locale/iswxdigit_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <wctype.h>
-
-int iswxdigit_l(wint_t c, locale_t l)
-{
-       return iswxdigit(c);
-}

diff --git a/src/locale/isxdigit_l.c b/src/locale/isxdigit_l.c
deleted file mode 100644 (file)
index 68649d0..0000000
--- a/src/locale/isxdigit_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <ctype.h>
-
-int isxdigit_l(int c, locale_t l)
-{
-       return isxdigit(c);
-}

diff --git a/src/locale/tolower_l.c b/src/locale/tolower_l.c
deleted file mode 100644 (file)
index ba27791..0000000
--- a/src/locale/tolower_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <ctype.h>
-
-int tolower_l(int c, locale_t l)
-{
-       return tolower(c);
-}

diff --git a/src/locale/toupper_l.c b/src/locale/toupper_l.c
deleted file mode 100644 (file)
index 73f2f39..0000000
--- a/src/locale/toupper_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <ctype.h>
-
-int toupper_l(int c, locale_t l)
-{
-       return toupper(c);
-}

diff --git a/src/locale/towctrans_l.c b/src/locale/towctrans_l.c
deleted file mode 100644 (file)
index 6222058..0000000
--- a/src/locale/towctrans_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <wctype.h>
-
-wint_t towctrans_l(wint_t c, wctrans_t t, locale_t l)
-{
-       return towctrans(c, t);
-}

diff --git a/src/locale/towlower_l.c b/src/locale/towlower_l.c
deleted file mode 100644 (file)
index aaaea37..0000000
--- a/src/locale/towlower_l.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <wctype.h>
-#include "libc.h"
-
-wint_t towlower_l(wint_t c, locale_t l)
-{
-       return towlower(c);
-}
-
-weak_alias(towlower_l, __towlower_l);

diff --git a/src/locale/towupper_l.c b/src/locale/towupper_l.c
deleted file mode 100644 (file)
index ad02a4b..0000000
--- a/src/locale/towupper_l.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <wctype.h>
-#include "libc.h"
-
-wint_t towupper_l(wint_t c, locale_t l)
-{
-       return towupper(c);
-}
-
-weak_alias(towupper_l, __towupper_l);

diff --git a/src/locale/wctrans_l.c b/src/locale/wctrans_l.c
deleted file mode 100644 (file)
index dae3381..0000000
--- a/src/locale/wctrans_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <wctype.h>
-
-wctrans_t wctrans_l(const char *s, locale_t l)
-{
-       return wctrans(s);
-}

diff --git a/src/locale/wctype_l.c b/src/locale/wctype_l.c
deleted file mode 100644 (file)
index 601bab3..0000000
--- a/src/locale/wctype_l.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <wctype.h>
-#include "libc.h"
-
-wctype_t wctype_l(const char *s, locale_t l)
-{
-       return wctype(s);
-}
-
-weak_alias(wctype_l, __wctype_l);