summaryrefslogtreecommitdiff
path: root/src/ctype
diff options
context:
space:
mode:
Diffstat (limited to 'src/ctype')
-rw-r--r--src/ctype/isblank.c3
-rw-r--r--src/ctype/iscntrl.c3
-rw-r--r--src/ctype/isgraph.c3
-rw-r--r--src/ctype/islower.c3
-rw-r--r--src/ctype/isprint.c3
-rw-r--r--src/ctype/ispunct.c3
-rw-r--r--src/ctype/isspace.c3
-rw-r--r--src/ctype/isupper.c3
-rw-r--r--src/ctype/isxdigit.c3
-rw-r--r--src/ctype/tolower.c1
-rw-r--r--src/ctype/toupper.c2
11 files changed, 10 insertions, 20 deletions
diff --git a/src/ctype/isblank.c b/src/ctype/isblank.c
index 1a597f82..2b48b67f 100644
--- a/src/ctype/isblank.c
+++ b/src/ctype/isblank.c
@@ -2,7 +2,6 @@
#include "limits.h"
#include "locale.h"
#include "nonstd/ctype.h"
-#include "nonstd/internal.h"
#include "nonstd/assert.h"
/** test whether a character is blank **/
@@ -12,7 +11,7 @@ int isblank(int c)
unsigned int *map = __libc(CTYPE);
- return map[c] & BLANK;
+ return map[c] & CT_BLANK;
}
/***
diff --git a/src/ctype/iscntrl.c b/src/ctype/iscntrl.c
index 31804123..eead7f5f 100644
--- a/src/ctype/iscntrl.c
+++ b/src/ctype/iscntrl.c
@@ -2,7 +2,6 @@
#include "limits.h"
#include "nonstd/assert.h"
#include "nonstd/ctype.h"
-#include "nonstd/internal.h"
/** test whether a character is a control character */
int iscntrl(int c)
@@ -15,7 +14,7 @@ int iscntrl(int c)
RETURN(0, ARGUMENT(c) is not a control character);
*/
- return map[c] == 0 || (map[c] == SPACE && c != ' ');
+ return map[c] == 0 || (map[c] == CT_SPACE && c != ' ');
}
/***
diff --git a/src/ctype/isgraph.c b/src/ctype/isgraph.c
index 8ad3be0b..206a09b7 100644
--- a/src/ctype/isgraph.c
+++ b/src/ctype/isgraph.c
@@ -2,7 +2,6 @@
#include "limits.h"
#include "nonstd/assert.h"
#include "nonstd/ctype.h"
-#include "nonstd/internal.h"
/** test whether a character is graphic **/
int isgraph(int c)
@@ -15,7 +14,7 @@ int isgraph(int c)
RETURN(0, ARGUMENT(c) is not a graphic character);
*/
- return map[c] & ~SPACE;
+ return map[c] & ~CT_SPACE;
}
/***
diff --git a/src/ctype/islower.c b/src/ctype/islower.c
index 082697dd..6b4764d8 100644
--- a/src/ctype/islower.c
+++ b/src/ctype/islower.c
@@ -1,7 +1,6 @@
#include <ctype.h>
#include "limits.h"
#include "nonstd/assert.h"
-#include "nonstd/internal.h"
#include "nonstd/ctype.h"
/** test whether a character is a lowercase letter **/
@@ -14,7 +13,7 @@ int islower(int c)
RETURN(NONZERO, ARGUMENT(c) is a lowercase letter);
RETURN(0, ARGUMENT(c) is not a lowercase letter);
*/
- return map[c] & LOWER;
+ return map[c] & CT_LOWER;
}
/***
diff --git a/src/ctype/isprint.c b/src/ctype/isprint.c
index 58120351..19847118 100644
--- a/src/ctype/isprint.c
+++ b/src/ctype/isprint.c
@@ -2,7 +2,6 @@
#include "limits.h"
#include "nonstd/assert.h"
#include "nonstd/ctype.h"
-#include "nonstd/internal.h"
/** test whether a character is printable **/
int isprint(int c)
@@ -15,7 +14,7 @@ int isprint(int c)
RETURN(0, ARGUMENT(c) is not a printable character);
*/
- return map[c] & ~SPACE || c == ' ';
+ return map[c] & ~CT_SPACE || c == ' ';
}
/***
diff --git a/src/ctype/ispunct.c b/src/ctype/ispunct.c
index bad66523..8a0cd118 100644
--- a/src/ctype/ispunct.c
+++ b/src/ctype/ispunct.c
@@ -2,7 +2,6 @@
#include "limits.h"
#include "nonstd/assert.h"
#include "nonstd/ctype.h"
-#include "nonstd/internal.h"
/** test whether a character is punctuation **/
int ispunct(int c)
@@ -15,7 +14,7 @@ int ispunct(int c)
RETURN(0, ARGUMENT(c) is not a punctuation character);
*/
- return map[c] & PUNCT;
+ return map[c] & CT_PUNCT;
}
/***
diff --git a/src/ctype/isspace.c b/src/ctype/isspace.c
index a83cb584..79aa9673 100644
--- a/src/ctype/isspace.c
+++ b/src/ctype/isspace.c
@@ -2,7 +2,6 @@
#include "limits.h"
#include "nonstd/assert.h"
#include "nonstd/ctype.h"
-#include "nonstd/internal.h"
/** test whether a character is white-space **/
int isspace(int c)
@@ -15,7 +14,7 @@ int isspace(int c)
RETURN(0, ARGUMENT(c) is not a white-space character);
*/
- return map[c] & SPACE;
+ return map[c] & CT_SPACE;
}
/***
diff --git a/src/ctype/isupper.c b/src/ctype/isupper.c
index 84247c28..0d3e7240 100644
--- a/src/ctype/isupper.c
+++ b/src/ctype/isupper.c
@@ -2,7 +2,6 @@
#include "limits.h"
#include "nonstd/assert.h"
#include "nonstd/ctype.h"
-#include "nonstd/internal.h"
/** test whether a character is an uppercase letter **/
int isupper(int c)
@@ -15,7 +14,7 @@ int isupper(int c)
RETURN(0, ARGUMENT(c) is not an uppercase letter);
*/
- return map[c] & UPPER;
+ return map[c] & CT_UPPER;
}
/***
diff --git a/src/ctype/isxdigit.c b/src/ctype/isxdigit.c
index 37857d92..30ddd618 100644
--- a/src/ctype/isxdigit.c
+++ b/src/ctype/isxdigit.c
@@ -2,7 +2,6 @@
#include "limits.h"
#include "nonstd/assert.h"
#include "nonstd/ctype.h"
-#include "nonstd/internal.h"
/** test whether a character is a hexadecimal digit **/
int isxdigit(int c)
@@ -14,7 +13,7 @@ int isxdigit(int c)
RETURN(NONZERO, ARGUMENT(c) is a hexadecimal digit);
RETURN(0, ARGUMENT(c) is not a hexadecimal digit);
*/
- return map[c] & XDIGIT;
+ return map[c] & CT_XDIGIT;
}
/***
diff --git a/src/ctype/tolower.c b/src/ctype/tolower.c
index b684eb7a..793de6bb 100644
--- a/src/ctype/tolower.c
+++ b/src/ctype/tolower.c
@@ -2,7 +2,6 @@
#include "limits.h"
#include "nonstd/assert.h"
#include "nonstd/ctype.h"
-#include "nonstd/internal.h"
/** convert an uppercase letter to lowercase **/
int tolower(int c)
diff --git a/src/ctype/toupper.c b/src/ctype/toupper.c
index f4611bc7..35b7c9e2 100644
--- a/src/ctype/toupper.c
+++ b/src/ctype/toupper.c
@@ -1,7 +1,7 @@
#include <ctype.h>
#include "limits.h"
#include "nonstd/assert.h"
-#include "nonstd/internal.h"
+#include "nonstd/ctype.h"
/** convert a lowercase letter to uppercase **/
int toupper(int c)
generated by cgit v1.2.1 (git 2.18.0) at 2025-12-08 00:23:26 +0000