[Openocd-svn] r2206 - trunk/src/helper

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-12 03:39:44 +0200 (Fri, 12 Jun 2009)
New Revision: 2206

Modified:
   trunk/src/helper/command.c
   trunk/src/helper/command.h
Log:
Add new parse_uinttype wrappers for strtoul in src/helper/command.[ch].
- Used to improve command argument parsing of unsigned integers values.


Modified: trunk/src/helper/command.c
===================================================================
--- trunk/src/helper/command.c	2009-06-11 21:55:43 UTC (rev 2205)
+++ trunk/src/helper/command.c	2009-06-12 01:39:44 UTC (rev 2206)
@@ -848,3 +848,18 @@
 	}
 	return 0;
 }
+
+int parse_ullong(const char *str, unsigned long long *ul)
+{
+	char *end;
+	*ul = strtoull(str, &end, 0);
+	bool okay = *str && !*end && ULLONG_MAX != *ul;
+	return okay ? ERROR_OK : ERROR_COMMAND_SYNTAX_ERROR;
+}
+int parse_ulong(const char *str, unsigned long *ul)
+{
+	char *end;
+	*ul = strtoul(str, &end, 0);
+	bool okay = *str && !*end && ULONG_MAX != *ul;
+	return okay ? ERROR_OK : ERROR_COMMAND_SYNTAX_ERROR;
+}

Modified: trunk/src/helper/command.h
===================================================================
--- trunk/src/helper/command.h	2009-06-11 21:55:43 UTC (rev 2205)
+++ trunk/src/helper/command.h	2009-06-12 01:39:44 UTC (rev 2206)
@@ -107,4 +107,20 @@
 
 long jim_global_long(const char *variable);
 
+int parse_ulong(const char *str, unsigned long *ul);
+int parse_ullong(const char *str, unsigned long long *ul);
+
+#define DEFINE_PARSE_ULONG(name, type, max) \
+	static inline int parse_##name(const char *str, type *ul) \
+	{ \
+		unsigned long n; \
+		int retval = parse_ulong(str, &n); \
+		*ul = n; \
+		return n > (max) ? ERROR_COMMAND_SYNTAX_ERROR : retval; \
+	}	
+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)
+
 #endif /* COMMAND_H */