human readable error message upon invalid arguments

[openocd.git] / src / helper / command.c

diff --git a/src/helper/command.c b/src/helper/command.c
index 94c3e464a0bf892cbd56b16c5644cac74066008b..ce140aa838afa9523456dda0b110fec5c50ad749 100644 (file)
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -2,7 +2,7 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007,2008 �yvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   Copyright (C) 2008, Duane Ellis                                       *
@@ -867,15 +867,27 @@ long jim_global_long(const char *variable)
        int parse##name(const char *str, type *ul) \
        { \
                if (!*str) \
+               { \
+                       LOG_ERROR("Invalid command argument"); \
                        return ERROR_COMMAND_ARGUMENT_INVALID; \
+               } \
                char *end; \
                *ul = func(str, &end, 0); \
                if (*end) \
+               { \
+                   LOG_ERROR("Invalid command argument"); \
                        return ERROR_COMMAND_ARGUMENT_INVALID; \
+               } \
                if ((max == *ul) && (ERANGE == errno)) \
+               { \
+                   LOG_ERROR("Argument overflow"); \
                        return ERROR_COMMAND_ARGUMENT_OVERFLOW; \
+               } \
                if (min && (min == *ul) && (ERANGE == errno)) \
+               { \
+                   LOG_ERROR("Argument underflow"); \
                        return ERROR_COMMAND_ARGUMENT_UNDERFLOW; \
+               } \
                return ERROR_OK; \
        }
 DEFINE_PARSE_NUM_TYPE(_ulong, unsigned long , strtoul, 0, ULONG_MAX)
@@ -896,7 +908,7 @@ DEFINE_PARSE_NUM_TYPE(_llong, long long, strtoll, LLONG_MIN, LLONG_MAX)
                        return ERROR_COMMAND_ARGUMENT_UNDERFLOW; \
                *ul = n; \
                return ERROR_OK; \
-       }       
+       }
 
 #define DEFINE_PARSE_ULONG(name, type, min, max) \
        DEFINE_PARSE_WRAPPER(name, type, min, max, unsigned long, _ulong)