From: oharboe at B. <oh...@ma...> - 2009-07-06 09:33:39
|
Author: oharboe Date: 2009-07-06 09:33:38 +0200 (Mon, 06 Jul 2009) New Revision: 2464 Modified: trunk/src/helper/command.c Log: human readable error message upon invalid arguments Modified: trunk/src/helper/command.c =================================================================== --- trunk/src/helper/command.c 2009-07-06 07:31:46 UTC (rev 2463) +++ trunk/src/helper/command.c 2009-07-06 07:33:38 UTC (rev 2464) @@ -2,7 +2,7 @@ * Copyright (C) 2005 by Dominic Rath * * Dom...@gm... * * * - * Copyright (C) 2007,2008 vind Harboe * + * Copyright (C) 2007,2008 �yvind Harboe * * oyv...@zy... * * * * Copyright (C) 2008, Duane Ellis * @@ -867,15 +867,27 @@ 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) |