Update parse_type macro definitions to allow re-use with signed types.
git-svn-id: svn://svn.berlios.de/openocd/trunk@2254 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
parent
8b16068941
commit
a3ec1e1f94
|
@ -110,14 +110,17 @@ long jim_global_long(const char *variable);
|
||||||
int parse_ulong(const char *str, unsigned long *ul);
|
int parse_ulong(const char *str, unsigned long *ul);
|
||||||
int parse_ullong(const char *str, unsigned long long *ul);
|
int parse_ullong(const char *str, unsigned long long *ul);
|
||||||
|
|
||||||
#define DEFINE_PARSE_ULONG(name, type, max) \
|
#define DEFINE_PARSE_NUM_WRAP(name, type, max, functype, funcname) \
|
||||||
static inline int parse_##name(const char *str, type *ul) \
|
static inline int parse_##name(const char *str, type *ul) \
|
||||||
{ \
|
{ \
|
||||||
unsigned long n; \
|
functype n; \
|
||||||
int retval = parse_ulong(str, &n); \
|
int retval = parse##funcname(str, &n); \
|
||||||
*ul = n; \
|
*ul = n; \
|
||||||
return n > (max) ? ERROR_COMMAND_SYNTAX_ERROR : retval; \
|
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(uint, unsigned, UINT_MAX)
|
||||||
DEFINE_PARSE_ULONG(u32, uint32_t, UINT32_MAX)
|
DEFINE_PARSE_ULONG(u32, uint32_t, UINT32_MAX)
|
||||||
DEFINE_PARSE_ULONG(u16, uint16_t, UINT16_MAX)
|
DEFINE_PARSE_ULONG(u16, uint16_t, UINT16_MAX)
|
||||||
|
|
Loading…
Reference in New Issue