To make it easier to review here is the output from diff between those files in libc/ and musl/src/
diff musl/src/locale/isalnum_l.c libc/locale/isalnum_l.c diff musl/src/locale/isalpha_l.c libc/locale/isalpha_l.c diff musl/src/locale/isblank_l.c libc/locale/isblank_l.c diff musl/src/locale/iscntrl_l.c libc/locale/iscntrl_l.c diff musl/src/locale/isdigit_l.c libc/locale/isdigit_l.c diff musl/src/locale/isgraph_l.c libc/locale/isgraph_l.c diff musl/src/locale/islower_l.c libc/locale/islower_l.c diff musl/src/locale/isprint_l.c libc/locale/isprint_l.c diff musl/src/locale/ispunct_l.c libc/locale/ispunct_l.c diff musl/src/locale/isspace_l.c libc/locale/isspace_l.c diff musl/src/locale/isupper_l.c libc/locale/isupper_l.c diff musl/src/locale/iswalnum_l.c libc/locale/iswalnum_l.c diff musl/src/locale/iswalpha_l.c libc/locale/iswalpha_l.c diff musl/src/locale/iswblank_l.c libc/locale/iswblank_l.c diff musl/src/locale/iswcntrl_l.c libc/locale/iswcntrl_l.c diff musl/src/locale/iswdigit_l.c libc/locale/iswdigit_l.c diff musl/src/locale/iswgraph_l.c libc/locale/iswgraph_l.c diff musl/src/locale/iswlower_l.c libc/locale/iswlower_l.c diff musl/src/locale/iswprint_l.c libc/locale/iswprint_l.c diff musl/src/locale/iswpunct_l.c libc/locale/iswpunct_l.c diff musl/src/locale/iswspace_l.c libc/locale/iswspace_l.c diff musl/src/locale/iswupper_l.c libc/locale/iswupper_l.c diff musl/src/locale/iswxdigit_l.c libc/locale/iswxdigit_l.c diff musl/src/locale/isxdigit_l.c libc/locale/isxdigit_l.c diff musl/src/locale/tolower_l.c libc/locale/tolower_l.c 2a3 > #undef isalnum_l 2a3 > #undef isalpha_l 2a3 > #undef isblank_l 2a3 > #undef iscntrl_l 2a3 > #undef isdigit_l 2a3 > #undef isgraph_l 2a3 > #undef islower_l 2a3 > #undef isprint_l 2a3 > #undef ispunct_l 2a3 > #undef isspace_l 2a3 > #undef isupper_l 2a3 > #undef iswalnum_l 2a3 > #undef iswalpha_l 2a3 > #undef iswblank_l 2a3 > #undef iswcntrl_l 2a3 > #undef iswdigit_l 2a3 > #undef iswgraph_l 2a3 > #undef iswlower_l 2a3 > #undef iswprint_l 2a3 > #undef iswpunct_l 2a3 > #undef iswspace_l 2a3 > #undef iswupper_l 2a3 > #undef iswxdigit_l 2a3 > #undef isxdigit_l 2a3 > #undef tolower_l On Wednesday, July 29, 2020 at 12:56:19 AM UTC-4, Waldek Kozaczuk wrote: > > Just like one of the earlier patches this one also > removes more files from libc/ folder that only differ by "#undef" macro > which is not necessary anymore. > > Signed-off-by: Waldemar Kozaczuk <[email protected]> > --- > Makefile | 50 +++++++++++++++++++-------------------- > libc/locale/isalnum_l.c | 7 ------ > libc/locale/isalpha_l.c | 7 ------ > libc/locale/isblank_l.c | 7 ------ > libc/locale/iscntrl_l.c | 7 ------ > libc/locale/isdigit_l.c | 7 ------ > libc/locale/isgraph_l.c | 7 ------ > libc/locale/islower_l.c | 7 ------ > libc/locale/isprint_l.c | 7 ------ > libc/locale/ispunct_l.c | 7 ------ > libc/locale/isspace_l.c | 7 ------ > libc/locale/isupper_l.c | 7 ------ > libc/locale/iswalnum_l.c | 7 ------ > libc/locale/iswalpha_l.c | 7 ------ > libc/locale/iswblank_l.c | 7 ------ > libc/locale/iswcntrl_l.c | 7 ------ > libc/locale/iswdigit_l.c | 7 ------ > libc/locale/iswgraph_l.c | 7 ------ > libc/locale/iswlower_l.c | 7 ------ > libc/locale/iswprint_l.c | 7 ------ > libc/locale/iswpunct_l.c | 7 ------ > libc/locale/iswspace_l.c | 7 ------ > libc/locale/iswupper_l.c | 7 ------ > libc/locale/iswxdigit_l.c | 7 ------ > libc/locale/isxdigit_l.c | 7 ------ > libc/locale/tolower_l.c | 7 ------ > 26 files changed, 25 insertions(+), 200 deletions(-) > delete mode 100644 libc/locale/isalnum_l.c > delete mode 100644 libc/locale/isalpha_l.c > delete mode 100644 libc/locale/isblank_l.c > delete mode 100644 libc/locale/iscntrl_l.c > delete mode 100644 libc/locale/isdigit_l.c > delete mode 100644 libc/locale/isgraph_l.c > delete mode 100644 libc/locale/islower_l.c > delete mode 100644 libc/locale/isprint_l.c > delete mode 100644 libc/locale/ispunct_l.c > delete mode 100644 libc/locale/isspace_l.c > delete mode 100644 libc/locale/isupper_l.c > delete mode 100644 libc/locale/iswalnum_l.c > delete mode 100644 libc/locale/iswalpha_l.c > delete mode 100644 libc/locale/iswblank_l.c > delete mode 100644 libc/locale/iswcntrl_l.c > delete mode 100644 libc/locale/iswdigit_l.c > delete mode 100644 libc/locale/iswgraph_l.c > delete mode 100644 libc/locale/iswlower_l.c > delete mode 100644 libc/locale/iswprint_l.c > delete mode 100644 libc/locale/iswpunct_l.c > delete mode 100644 libc/locale/iswspace_l.c > delete mode 100644 libc/locale/iswupper_l.c > delete mode 100644 libc/locale/iswxdigit_l.c > delete mode 100644 libc/locale/isxdigit_l.c > delete mode 100644 libc/locale/tolower_l.c > > diff --git a/Makefile b/Makefile > index ff0ca4d7..5d54c6da 100644 > --- a/Makefile > +++ b/Makefile > @@ -1013,31 +1013,31 @@ libc += locale/duplocale.o > libc += locale/freelocale.o > musl += locale/iconv.o > musl += locale/intl.o > -libc += locale/isalnum_l.o > -libc += locale/isalpha_l.o > -libc += locale/isblank_l.o > -libc += locale/iscntrl_l.o > -libc += locale/isdigit_l.o > -libc += locale/isgraph_l.o > -libc += locale/islower_l.o > -libc += locale/isprint_l.o > -libc += locale/ispunct_l.o > -libc += locale/isspace_l.o > -libc += locale/isupper_l.o > -libc += locale/iswalnum_l.o > -libc += locale/iswalpha_l.o > -libc += locale/iswblank_l.o > -libc += locale/iswcntrl_l.o > +musl += locale/isalnum_l.o > +musl += locale/isalpha_l.o > +musl += locale/isblank_l.o > +musl += locale/iscntrl_l.o > +musl += locale/isdigit_l.o > +musl += locale/isgraph_l.o > +musl += locale/islower_l.o > +musl += locale/isprint_l.o > +musl += locale/ispunct_l.o > +musl += locale/isspace_l.o > +musl += locale/isupper_l.o > +musl += locale/iswalnum_l.o > +musl += locale/iswalpha_l.o > +musl += locale/iswblank_l.o > +musl += locale/iswcntrl_l.o > libc += locale/iswctype_l.o > -libc += locale/iswdigit_l.o > -libc += locale/iswgraph_l.o > -libc += locale/iswlower_l.o > -libc += locale/iswprint_l.o > -libc += locale/iswpunct_l.o > -libc += locale/iswspace_l.o > -libc += locale/iswupper_l.o > -libc += locale/iswxdigit_l.o > -libc += locale/isxdigit_l.o > +musl += locale/iswdigit_l.o > +musl += locale/iswgraph_l.o > +musl += locale/iswlower_l.o > +musl += locale/iswprint_l.o > +musl += locale/iswpunct_l.o > +musl += locale/iswspace_l.o > +musl += locale/iswupper_l.o > +musl += locale/iswxdigit_l.o > +musl += locale/isxdigit_l.o > libc += locale/langinfo.o > musl += locale/localeconv.o > libc += locale/nl_langinfo_l.o > @@ -1054,7 +1054,7 @@ libc += locale/strtof_l.o > libc += locale/strtold_l.o > libc += locale/strxfrm.o > libc += locale/strxfrm_l.o > -libc += locale/tolower_l.o > +musl += locale/tolower_l.o > libc += locale/toupper_l.o > musl += locale/towctrans_l.o > libc += locale/towlower_l.o > diff --git a/libc/locale/isalnum_l.c b/libc/locale/isalnum_l.c > deleted file mode 100644 > index 8e2b8778..00000000 > --- a/libc/locale/isalnum_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <ctype.h> > - > -#undef isalnum_l > -int isalnum_l(int c, locale_t l) > -{ > - return isalnum(c); > -} > diff --git a/libc/locale/isalpha_l.c b/libc/locale/isalpha_l.c > deleted file mode 100644 > index 1a7421e1..00000000 > --- a/libc/locale/isalpha_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <ctype.h> > - > -#undef isalpha_l > -int isalpha_l(int c, locale_t l) > -{ > - return isalpha(c); > -} > diff --git a/libc/locale/isblank_l.c b/libc/locale/isblank_l.c > deleted file mode 100644 > index 1dc6d163..00000000 > --- a/libc/locale/isblank_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <ctype.h> > - > -#undef isblank_l > -int isblank_l(int c, locale_t l) > -{ > - return isblank(c); > -} > diff --git a/libc/locale/iscntrl_l.c b/libc/locale/iscntrl_l.c > deleted file mode 100644 > index ed1b13a5..00000000 > --- a/libc/locale/iscntrl_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <ctype.h> > - > -#undef iscntrl_l > -int iscntrl_l(int c, locale_t l) > -{ > - return iscntrl(c); > -} > diff --git a/libc/locale/isdigit_l.c b/libc/locale/isdigit_l.c > deleted file mode 100644 > index b086d935..00000000 > --- a/libc/locale/isdigit_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <ctype.h> > - > -#undef isdigit_l > -int isdigit_l(int c, locale_t l) > -{ > - return isdigit(c); > -} > diff --git a/libc/locale/isgraph_l.c b/libc/locale/isgraph_l.c > deleted file mode 100644 > index 23d2ba51..00000000 > --- a/libc/locale/isgraph_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <ctype.h> > - > -#undef isgraph_l > -int isgraph_l(int c, locale_t l) > -{ > - return isgraph(c); > -} > diff --git a/libc/locale/islower_l.c b/libc/locale/islower_l.c > deleted file mode 100644 > index d35742b6..00000000 > --- a/libc/locale/islower_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <ctype.h> > - > -#undef islower_l > -int islower_l(int c, locale_t l) > -{ > - return islower(c); > -} > diff --git a/libc/locale/isprint_l.c b/libc/locale/isprint_l.c > deleted file mode 100644 > index debf3c2f..00000000 > --- a/libc/locale/isprint_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <ctype.h> > - > -#undef isprint_l > -int isprint_l(int c, locale_t l) > -{ > - return isprint(c); > -} > diff --git a/libc/locale/ispunct_l.c b/libc/locale/ispunct_l.c > deleted file mode 100644 > index 161ea961..00000000 > --- a/libc/locale/ispunct_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <ctype.h> > - > -#undef ispunct_l > -int ispunct_l(int c, locale_t l) > -{ > - return ispunct(c); > -} > diff --git a/libc/locale/isspace_l.c b/libc/locale/isspace_l.c > deleted file mode 100644 > index deb345eb..00000000 > --- a/libc/locale/isspace_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <ctype.h> > - > -#undef isspace_l > -int isspace_l(int c, locale_t l) > -{ > - return isspace(c); > -} > diff --git a/libc/locale/isupper_l.c b/libc/locale/isupper_l.c > deleted file mode 100644 > index 30f3365f..00000000 > --- a/libc/locale/isupper_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <ctype.h> > - > -#undef isupper_l > -int isupper_l(int c, locale_t l) > -{ > - return isupper(c); > -} > diff --git a/libc/locale/iswalnum_l.c b/libc/locale/iswalnum_l.c > deleted file mode 100644 > index ab163c00..00000000 > --- a/libc/locale/iswalnum_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <wctype.h> > - > -#undef iswalnum_l > -int iswalnum_l(wint_t c, locale_t l) > -{ > - return iswalnum(c); > -} > diff --git a/libc/locale/iswalpha_l.c b/libc/locale/iswalpha_l.c > deleted file mode 100644 > index b0b2cf19..00000000 > --- a/libc/locale/iswalpha_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <wctype.h> > - > -#undef iswalpha_l > -int iswalpha_l(wint_t c, locale_t l) > -{ > - return iswalpha(c); > -} > diff --git a/libc/locale/iswblank_l.c b/libc/locale/iswblank_l.c > deleted file mode 100644 > index 56159c36..00000000 > --- a/libc/locale/iswblank_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <wctype.h> > - > -#undef iswblank_l > -int iswblank_l(wint_t c, locale_t l) > -{ > - return iswblank(c); > -} > diff --git a/libc/locale/iswcntrl_l.c b/libc/locale/iswcntrl_l.c > deleted file mode 100644 > index b5cb536f..00000000 > --- a/libc/locale/iswcntrl_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <wctype.h> > - > -#undef iswcntrl_l > -int iswcntrl_l(wint_t c, locale_t l) > -{ > - return iswcntrl(c); > -} > diff --git a/libc/locale/iswdigit_l.c b/libc/locale/iswdigit_l.c > deleted file mode 100644 > index 2e6f50d8..00000000 > --- a/libc/locale/iswdigit_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <wctype.h> > - > -#undef iswdigit_l > -int iswdigit_l(wint_t c, locale_t l) > -{ > - return iswdigit(c); > -} > diff --git a/libc/locale/iswgraph_l.c b/libc/locale/iswgraph_l.c > deleted file mode 100644 > index dd213969..00000000 > --- a/libc/locale/iswgraph_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <wctype.h> > - > -#undef iswgraph_l > -int iswgraph_l(wint_t c, locale_t l) > -{ > - return iswgraph(c); > -} > diff --git a/libc/locale/iswlower_l.c b/libc/locale/iswlower_l.c > deleted file mode 100644 > index bc185727..00000000 > --- a/libc/locale/iswlower_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <wctype.h> > - > -#undef iswlower_l > -int iswlower_l(wint_t c, locale_t l) > -{ > - return iswlower(c); > -} > diff --git a/libc/locale/iswprint_l.c b/libc/locale/iswprint_l.c > deleted file mode 100644 > index eec9c36e..00000000 > --- a/libc/locale/iswprint_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <wctype.h> > - > -#undef iswprint_l > -int iswprint_l(wint_t c, locale_t l) > -{ > - return iswprint(c); > -} > diff --git a/libc/locale/iswpunct_l.c b/libc/locale/iswpunct_l.c > deleted file mode 100644 > index f41e3d3e..00000000 > --- a/libc/locale/iswpunct_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <wctype.h> > - > -#undef iswpunct_l > -int iswpunct_l(wint_t c, locale_t l) > -{ > - return iswpunct(c); > -} > diff --git a/libc/locale/iswspace_l.c b/libc/locale/iswspace_l.c > deleted file mode 100644 > index cd15ab3a..00000000 > --- a/libc/locale/iswspace_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <wctype.h> > - > -#undef iswspace_l > -int iswspace_l(wint_t c, locale_t l) > -{ > - return iswspace(c); > -} > diff --git a/libc/locale/iswupper_l.c b/libc/locale/iswupper_l.c > deleted file mode 100644 > index e44ea244..00000000 > --- a/libc/locale/iswupper_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <wctype.h> > - > -#undef iswupper_l > -int iswupper_l(wint_t c, locale_t l) > -{ > - return iswupper(c); > -} > diff --git a/libc/locale/iswxdigit_l.c b/libc/locale/iswxdigit_l.c > deleted file mode 100644 > index 759be9d4..00000000 > --- a/libc/locale/iswxdigit_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <wctype.h> > - > -#undef iswxdigit_l > -int iswxdigit_l(wint_t c, locale_t l) > -{ > - return iswxdigit(c); > -} > diff --git a/libc/locale/isxdigit_l.c b/libc/locale/isxdigit_l.c > deleted file mode 100644 > index d45ed2f8..00000000 > --- a/libc/locale/isxdigit_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <ctype.h> > - > -#undef isxdigit_l > -int isxdigit_l(int c, locale_t l) > -{ > - return isxdigit(c); > -} > diff --git a/libc/locale/tolower_l.c b/libc/locale/tolower_l.c > deleted file mode 100644 > index c01c5beb..00000000 > --- a/libc/locale/tolower_l.c > +++ /dev/null > @@ -1,7 +0,0 @@ > -#include <ctype.h> > - > -#undef tolower_l > -int tolower_l(int c, locale_t l) > -{ > - return tolower(c); > -} > -- > 2.25.1 > > -- You received this message because you are subscribed to the Google Groups "OSv Development" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/osv-dev/a8807295-eed1-42e1-a79d-091360a2ac29o%40googlegroups.com.
