summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/ctype.h75
-rw-r--r--lib/libc/gen/isctype.c24
2 files changed, 50 insertions, 49 deletions
diff --git a/include/ctype.h b/include/ctype.h
index 20cd43c44f2..ad4289d3538 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ctype.h,v 1.13 2003/06/02 19:34:12 millert Exp $ */
+/* $OpenBSD: ctype.h,v 1.14 2003/06/10 22:00:31 millert Exp $ */
/* $NetBSD: ctype.h,v 1.14 1994/10/26 00:55:47 cgd Exp $ */
/*
@@ -50,12 +50,12 @@
#define _X 0x40
#define _B 0x80
+__BEGIN_DECLS
+
extern const char *_ctype_;
extern const short *_tolower_tab_;
extern const short *_toupper_tab_;
-#ifdef _ANSI_LIBRARY
-__BEGIN_DECLS
int isalnum(int);
int isalpha(int);
int iscntrl(int);
@@ -76,107 +76,108 @@ int isascii(int);
int toascii(int);
int _tolower(int);
int _toupper(int);
-#endif
-__END_DECLS
+#endif /* !_ANSI_SOURCE && !_POSIX_SOURCE */
-#else /* !_ANSI_LIBRARY */
+#ifndef _ANSI_LIBRARY
-static __inline int isalnum(int c)
+extern __inline int isalnum(int c)
{
- return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & (_U|_L|_N)));
+ return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & (_U|_L|_N)));
}
-static __inline int isalpha(int c)
+extern __inline int isalpha(int c)
{
- return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & (_U|_L)));
+ return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & (_U|_L)));
}
-static __inline int iscntrl(int c)
+extern __inline int iscntrl(int c)
{
- return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & _C));
+ return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & _C));
}
-static __inline int isdigit(int c)
+extern __inline int isdigit(int c)
{
- return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & _N));
+ return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & _N));
}
-static __inline int isgraph(int c)
+extern __inline int isgraph(int c)
{
- return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & (_P|_U|_L|_N)));
+ return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & (_P|_U|_L|_N)));
}
-static __inline int islower(int c)
+extern __inline int islower(int c)
{
- return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & _L));
+ return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & _L));
}
-static __inline int isprint(int c)
+extern __inline int isprint(int c)
{
- return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & (_P|_U|_L|_N|_B)));
+ return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & (_P|_U|_L|_N|_B)));
}
-static __inline int ispunct(int c)
+extern __inline int ispunct(int c)
{
- return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & _P));
+ return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & _P));
}
-static __inline int isspace(int c)
+extern __inline int isspace(int c)
{
- return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & _S));
+ return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & _S));
}
-static __inline int isupper(int c)
+extern __inline int isupper(int c)
{
- return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & _U));
+ return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & _U));
}
-static __inline int isxdigit(int c)
+extern __inline int isxdigit(int c)
{
- return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & (_N|_X)));
+ return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & (_N|_X)));
}
-static __inline int tolower(int c)
+extern __inline int tolower(int c)
{
if ((unsigned int)c > 0177)
return (c);
return ((_tolower_tab_ + 1)[c]);
}
-static __inline int toupper(int c)
+extern __inline int toupper(int c)
{
if ((unsigned int)c > 0177)
return (c);
return ((_toupper_tab_ + 1)[c]);
}
-#if !defined(_ANSI_SOURCE) && !defined (_POSIX_SOURCE)
-static __inline int isblank(int c)
+#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
+extern __inline int isblank(int c)
{
return (c == ' ' || c == '\t');
}
-static __inline int isascii(int c)
+extern __inline int isascii(int c)
{
return ((unsigned int)c <= 0177);
}
-static __inline int toascii(int c)
+extern __inline int toascii(int c)
{
return (c & 0177);
}
-static __inline int _tolower(int c)
+extern __inline int _tolower(int c)
{
return (c - 'A' + 'a');
}
-static __inline int _toupper(int c)
+extern __inline int _toupper(int c)
{
return (c - 'a' + 'A');
}
-#endif
+#endif /* !_ANSI_SOURCE && !_POSIX_SOURCE */
#endif /* !_ANSI_LIBRARY */
+__END_DECLS
+
#endif /* !_CTYPE_H_ */
diff --git a/lib/libc/gen/isctype.c b/lib/libc/gen/isctype.c
index 85a2dddaa5a..5cd9b58602b 100644
--- a/lib/libc/gen/isctype.c
+++ b/lib/libc/gen/isctype.c
@@ -33,7 +33,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: isctype.c,v 1.8 2003/06/02 20:18:34 millert Exp $";
+static char rcsid[] = "$OpenBSD: isctype.c,v 1.9 2003/06/10 22:00:31 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#define _ANSI_LIBRARY
@@ -45,7 +45,7 @@ int
isalnum(c)
int c;
{
- return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & (_U|_L|_N)));
+ return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)c] & (_U|_L|_N)));
}
#undef isalpha
@@ -53,7 +53,7 @@ int
isalpha(c)
int c;
{
- return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & (_U|_L)));
+ return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)c] & (_U|_L)));
}
#undef isblank
@@ -69,7 +69,7 @@ int
iscntrl(c)
int c;
{
- return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & _C));
+ return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)c] & _C));
}
#undef isdigit
@@ -77,7 +77,7 @@ int
isdigit(c)
int c;
{
- return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & _N));
+ return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)c] & _N));
}
#undef isgraph
@@ -85,7 +85,7 @@ int
isgraph(c)
int c;
{
- return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & (_P|_U|_L|_N)));
+ return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)c] & (_P|_U|_L|_N)));
}
#undef islower
@@ -93,7 +93,7 @@ int
islower(c)
int c;
{
- return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & _L));
+ return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)c] & _L));
}
#undef isprint
@@ -101,7 +101,7 @@ int
isprint(c)
int c;
{
- return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & (_P|_U|_L|_N|_B)));
+ return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)c] & (_P|_U|_L|_N|_B)));
}
#undef ispunct
@@ -109,7 +109,7 @@ int
ispunct(c)
int c;
{
- return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & _P));
+ return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)c] & _P));
}
#undef isspace
@@ -117,7 +117,7 @@ int
isspace(c)
int c;
{
- return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & _S));
+ return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)c] & _S));
}
#undef isupper
@@ -125,7 +125,7 @@ int
isupper(c)
int c;
{
- return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & _U));
+ return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)c] & _U));
}
#undef isxdigit
@@ -133,7 +133,7 @@ int
isxdigit(c)
int c;
{
- return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & (_N|_X)));
+ return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)c] & (_N|_X)));
}
#undef isascii
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 23:00:44 +0000