summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMark Whitley <markw@lineo.com>2000-12-05 20:42:48 +0000
committerMark Whitley <markw@lineo.com>2000-12-05 20:42:48 +0000
commitab147f608d1215a9208e6d1fe93b6532a707dae4 (patch)
treef5d539ed3227936085b32e553e4dd0b921f5d402
parent26a3adb24490ed4f6b9e8a9a1886846d4f8d90dc (diff)
Removed isBlank and isWildCard macros that were totally unused (should anyone
need isBlank, please use isblank() in ctype.h). Converted isDecimal and isOctal into inline functions. Compiled, tested, worked.
-rw-r--r--busybox.h7
-rw-r--r--include/busybox.h7
2 files changed, 4 insertions, 10 deletions
diff --git a/busybox.h b/busybox.h
index 21c62faac..63f39590f 100644
--- a/busybox.h
+++ b/busybox.h
@@ -55,11 +55,8 @@
#define BUF_SIZE 8192
#define EXPAND_ALLOC 1024
-
-#define isBlank(ch) (((ch) == ' ') || ((ch) == '\t'))
-#define isDecimal(ch) (((ch) >= '0') && ((ch) <= '9'))
-#define isOctal(ch) (((ch) >= '0') && ((ch) <= '7'))
-#define isWildCard(ch) (((ch) == '*') || ((ch) == '?') || ((ch) == '['))
+static inline int isDecimal(ch) { return ((ch >= '0') && (ch <= '9')); }
+static inline int isOctal(ch) { return ((ch >= '0') && (ch <= '7')); }
/* Macros for min/max. */
#ifndef MIN
diff --git a/include/busybox.h b/include/busybox.h
index 21c62faac..63f39590f 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -55,11 +55,8 @@
#define BUF_SIZE 8192
#define EXPAND_ALLOC 1024
-
-#define isBlank(ch) (((ch) == ' ') || ((ch) == '\t'))
-#define isDecimal(ch) (((ch) >= '0') && ((ch) <= '9'))
-#define isOctal(ch) (((ch) >= '0') && ((ch) <= '7'))
-#define isWildCard(ch) (((ch) == '*') || ((ch) == '?') || ((ch) == '['))
+static inline int isDecimal(ch) { return ((ch >= '0') && (ch <= '9')); }
+static inline int isOctal(ch) { return ((ch >= '0') && (ch <= '7')); }
/* Macros for min/max. */
#ifndef MIN