From: zwelch Date: Wed, 17 Jun 2009 00:30:11 +0000 (+0000) Subject: Update parse_type macro definitions to allow re-use with signed types. X-Git-Tag: v0.2.0~261 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a3ec1e1f94edf547932e109b93b3ea9d443b1758;p=openocd 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 --- diff --git a/src/helper/command.h b/src/helper/command.h index 293eb141..fb80d597 100644 --- a/src/helper/command.h +++ b/src/helper/command.h @@ -110,14 +110,17 @@ 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) \ +#define DEFINE_PARSE_NUM_WRAP(name, type, max, functype, funcname) \ static inline int parse_##name(const char *str, type *ul) \ { \ - unsigned long n; \ - int retval = parse_ulong(str, &n); \ + 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)