From: Szabolcs Nagy <nsz@port70.net>
Date: Wed, 13 Aug 2014 14:47:51 +0000 (+0200)
Subject: add inline isspace in ctype.h as an optimization
X-Git-Tag: v1.1.5~70
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b04971d91a46d34b5e643ee2e8164171b6247216;p=oweals%2Fmusl.git

add inline isspace in ctype.h as an optimization

isspace can be a bottleneck in a simple parser, inlining it
gives slightly smaller and faster code

src/locale/pleval.o already had this optimization, the size
change for other libc functions for i386 is

src/internal/intscan.o     2134    2118   -16
src/locale/dcngettext.o    1562    1552   -10
src/network/res_msend.o    1961    1940   -21
src/network/lookup_name.o  2627    2608   -19
src/network/getnameinfo.o  1814    1811    -3
src/network/lookup_serv.o   643     624   -19
src/stdio/vfscanf.o        2675    2663   -12
src/stdlib/atoll.o          117     107   -10
src/stdlib/atoi.o            95      91    -4
src/stdlib/atol.o            95      91    -4
src/time/strptime.o        1515    1503   -12
(TOTALS)                 432451  432321  -130
---

diff --git a/include/ctype.h b/include/ctype.h
index 8f0d1687..a6f44df2 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -22,13 +22,18 @@ int   isxdigit(int);
 int   tolower(int);
 int   toupper(int);
 
+static __inline int __isspace(int _c)
+{
+	return _c == ' ' || (unsigned)_c-'\t' < 5;
+}
+
 #define isalpha(a) ((((unsigned)(a)|32)-'a') < 26)
 #define isdigit(a) (((unsigned)(a)-'0') < 10)
 #define islower(a) (((unsigned)(a)-'a') < 26)
 #define isupper(a) (((unsigned)(a)-'A') < 26)
 #define isprint(a) (((unsigned)(a)-0x20) < 0x5f)
 #define isgraph(a) (((unsigned)(a)-0x21) < 0x5e)
-
+#define isspace(a) __isspace(a)
 
 
 #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
diff --git a/src/ctype/isspace.c b/src/ctype/isspace.c
index 7dff20d0..231e9079 100644
--- a/src/ctype/isspace.c
+++ b/src/ctype/isspace.c
@@ -1,5 +1,6 @@
 #include <ctype.h>
 #include "libc.h"
+#undef isspace
 
 int isspace(int c)
 {
diff --git a/src/locale/pleval.c b/src/locale/pleval.c
index 961dabc0..d60058da 100644
--- a/src/locale/pleval.c
+++ b/src/locale/pleval.c
@@ -28,14 +28,6 @@ struct st {
 	int op;
 };
 
-/* TODO: this should go into ctypes.h */
-#undef isspace
-#define isspace(a) __isspace(a)
-static __inline int __isspace(int _c)
-{
-	return _c == ' ' || (unsigned)_c-'\t' < 5;
-}
-
 static const char *skipspace(const char *s)
 {
 	while (isspace(*s)) s++;