Move definition of parse_type helpers to command.c:

- Add declarations in header file.
- Improve wrapper implementations to check for underflow.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2257 b42882b7-edfa-0310-969c-e2dbd0fdcd60

2 files changed, 41 insertions, 22 deletions

diff --git a/src/helper/command.c b/src/helper/command.c
index 9a8907d6..bb3de2ce 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -880,3 +880,32 @@ DEFINE_PARSE_NUM_TYPE(_ulong, unsigned long , strtoul, 0, ULONG_MAX)
 DEFINE_PARSE_NUM_TYPE(_ullong, unsigned long long, strtoull, 0, ULLONG_MAX)
 DEFINE_PARSE_NUM_TYPE(_long, long , strtol, LONG_MIN, LONG_MAX)
 DEFINE_PARSE_NUM_TYPE(_llong, long long, strtoll, LLONG_MIN, LLONG_MAX)
+
+#define DEFINE_PARSE_WRAPPER(name, type, min, max, functype, funcname) \
+	int parse_##name(const char *str, type *ul) \
+	{ \
+		functype n; \
+		int retval = parse##funcname(str, &n); \
+		if (ERROR_OK != retval) \
+			return retval; \
+		if (n > max) \
+			return ERROR_COMMAND_SYNTAX_ERROR; \
+		if (min) \
+			return ERROR_COMMAND_SYNTAX_ERROR; \
+		*ul = n; \
+		return ERROR_OK; \
+	}	
+
+#define DEFINE_PARSE_ULONG(name, type, min, max) \
+	DEFINE_PARSE_WRAPPER(name, type, min, max, unsigned long, _ulong)
+DEFINE_PARSE_ULONG(uint, unsigned, 0, UINT_MAX)
+DEFINE_PARSE_ULONG(u32, uint32_t, 0, UINT32_MAX)
+DEFINE_PARSE_ULONG(u16, uint16_t, 0, UINT16_MAX)
+DEFINE_PARSE_ULONG(u8, uint8_t, 0, UINT8_MAX)
+
+#define DEFINE_PARSE_LONG(name, type, min, max) \
+	DEFINE_PARSE_WRAPPER(name, type, min, max, long, _long)
+DEFINE_PARSE_LONG(int, int, n < INT_MIN, INT_MAX)
+DEFINE_PARSE_LONG(s32, int32_t, n < INT32_MIN, INT32_MAX)
+DEFINE_PARSE_LONG(s16, int16_t, n < INT16_MIN, INT16_MAX)
+DEFINE_PARSE_LONG(s8, int8_t, n < INT8_MIN, INT8_MAX)
diff --git a/src/helper/command.h b/src/helper/command.h
index 4e7180fa..e4908dd0 100644
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -113,28 +113,18 @@ int parse_ullong(const char *str, unsigned long long *ul);
 int parse_long(const char *str, long *ul);
 int parse_llong(const char *str, long long *ul);
 
-#define DEFINE_PARSE_NUM_WRAP(name, type, max, functype, funcname) \
-	static inline int parse_##name(const char *str, type *ul) \
-	{ \
-		functype n; \
-		int retval = parse##funcname(str, &n); \
-		*ul = n; \
-		return n > (max) ? ERROR_COMMAND_SYNTAX_ERROR : retval; \
-	}	
-
-#define DEFINE_PARSE_ULONG(name, type, max) \
-	DEFINE_PARSE_NUM_WRAP(name, type, max, unsigned long, _ulong)
-DEFINE_PARSE_ULONG(uint, unsigned, UINT_MAX)
-DEFINE_PARSE_ULONG(u32, uint32_t, UINT32_MAX)
-DEFINE_PARSE_ULONG(u16, uint16_t, UINT16_MAX)
-DEFINE_PARSE_ULONG(u8, uint8_t, UINT8_MAX)
-
-#define DEFINE_PARSE_LONG(name, type, max) \
-	DEFINE_PARSE_NUM_WRAP(name, type, max, long, _long)
-DEFINE_PARSE_LONG(int, int, INT_MAX)
-DEFINE_PARSE_LONG(s32, int32_t, INT32_MAX)
-DEFINE_PARSE_LONG(s16, int16_t, INT16_MAX)
-DEFINE_PARSE_LONG(s8, int8_t, INT8_MAX)
+#define DECLARE_PARSE_WRAPPER(name, type) \
+	int parse_##name(const char *str, type *ul)
+
+DECLARE_PARSE_WRAPPER(uint, unsigned);
+DECLARE_PARSE_WRAPPER(u32, uint32_t);
+DECLARE_PARSE_WRAPPER(u16, uint16_t);
+DECLARE_PARSE_WRAPPER(u8, uint8_t);
+
+DECLARE_PARSE_WRAPPER(int, int);
+DECLARE_PARSE_WRAPPER(s32, int32_t);
+DECLARE_PARSE_WRAPPER(s16, int16_t);
+DECLARE_PARSE_WRAPPER(s8, int8_t);
 
 void script_debug(Jim_Interp *interp, const char *cmd, int argc, Jim_Obj *const *argv);