Commit d579befc authored by zwelch's avatar zwelch
Browse files

Add argument parsing errors in command.h, use in parse_type routines.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2258 b42882b7-edfa-0310-969c-e2dbd0fdcd60
parent 0e289979
......@@ -867,13 +867,15 @@ long jim_global_long(const char *variable)
int parse##name(const char *str, type *ul) \
{ \
if (!*str) \
return ERROR_COMMAND_SYNTAX_ERROR; \
return ERROR_COMMAND_ARGUMENT_INVALID; \
char *end; \
*ul = func(str, &end, 0); \
if (*end) \
return ERROR_COMMAND_SYNTAX_ERROR; \
if (*ul == max || (min && min == *ul)) \
return ERROR_COMMAND_SYNTAX_ERROR; \
return ERROR_COMMAND_ARGUMENT_INVALID; \
if (*ul == max) \
return ERROR_COMMAND_ARGUMENT_OVERFLOW; \
if (min && min == *ul) \
return ERROR_COMMAND_ARGUMENT_UNDERFLOW; \
return ERROR_OK; \
}
DEFINE_PARSE_NUM_TYPE(_ulong, unsigned long , strtoul, 0, ULONG_MAX)
......@@ -889,9 +891,9 @@ DEFINE_PARSE_NUM_TYPE(_llong, long long, strtoll, LLONG_MIN, LLONG_MAX)
if (ERROR_OK != retval) \
return retval; \
if (n > max) \
return ERROR_COMMAND_SYNTAX_ERROR; \
return ERROR_COMMAND_ARGUMENT_OVERFLOW; \
if (min) \
return ERROR_COMMAND_SYNTAX_ERROR; \
return ERROR_COMMAND_ARGUMENT_UNDERFLOW; \
*ul = n; \
return ERROR_OK; \
}
......
......@@ -98,6 +98,9 @@ extern void process_jim_events(void);
#define ERROR_COMMAND_CLOSE_CONNECTION (-600)
#define ERROR_COMMAND_SYNTAX_ERROR (-601)
#define ERROR_COMMAND_NOTFOUND (-602)
#define ERROR_COMMAND_ARGUMENT_INVALID (-603)
#define ERROR_COMMAND_ARGUMENT_OVERFLOW (-604)
#define ERROR_COMMAND_ARGUMENT_UNDERFLOW (-605)
extern int fast_and_dangerous;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment