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.

diff --git a/busybox.h b/busybox.h
index 21c62faac9a0487d84a6b7fabf68e060c4f35f2c..63f39590fa3bd36b85441ac745790f94349c520f 100644 (file)
--- 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 21c62faac9a0487d84a6b7fabf68e060c4f35f2c..63f39590fa3bd36b85441ac745790f94349c520f 100644 (file)
--- 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