proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 02:43:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: silence type range warning in macro

Browse Source 
While splitting up the CLI input macro is a bit annoying, this seems to
be the least annoying way to get rid of the "< 0" comparison warning for
unsigned long.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
(cherry picked from commit 81a4e85442e2011a47bbb25e8301dc40ec4ed9b6)
This commit is contained in:
David Lamparter 2015-03-03 08:56:48 +01:00 committed by Daniel Walton
parent 07e54734a1
commit 5eafab7614
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/keychain.c
View File

@ -381,17 +381,21 @@ key_str2time (const char *time_str, const char *day_str, const char *month_str,
NULL
};
#define GET_LONG_RANGE(V,STR,MIN,MAX) \
#define _GET_LONG_RANGE(V,STR,MMCOND) \
{ \
unsigned long tmpl; \
char *endptr = NULL; \
tmpl = strtoul ((STR), &endptr, 10); \
if (*endptr != '\0' || tmpl == ULONG_MAX) \
return -1; \
if ( tmpl < (MIN) || tmpl > (MAX)) \
if (MMCOND) \
return -1; \
(V) = tmpl; \
}
#define GET_LONG_RANGE(V,STR,MIN,MAX) \
_GET_LONG_RANGE(V,STR,tmpl < (MIN) || tmpl > (MAX))
#define GET_LONG_RANGE0(V,STR,MAX) \
_GET_LONG_RANGE(V,STR,tmpl > (MAX))
/* Check hour field of time_str. */
colon = strchr (time_str, ':');
@ -400,7 +404,7 @@ key_str2time (const char *time_str, const char *day_str, const char *month_str,
*colon = '\0';
/* Hour must be between 0 and 23. */
GET_LONG_RANGE (hour, time_str, 0, 23);
GET_LONG_RANGE0 (hour, time_str, 23);
/* Check min field of time_str. */
time_str = colon + 1;
@ -410,7 +414,7 @@ key_str2time (const char *time_str, const char *day_str, const char *month_str,
*colon = '\0';
/* Min must be between 0 and 59. */
GET_LONG_RANGE (min, time_str, 0, 59);
GET_LONG_RANGE0 (min, time_str, 59);
/* Check sec field of time_str. */
time_str = colon + 1;
@ -418,7 +422,7 @@ key_str2time (const char *time_str, const char *day_str, const char *month_str,
return -1;
/* Sec must be between 0 and 59. */
GET_LONG_RANGE (sec, time_str, 0, 59);
GET_LONG_RANGE0 (sec, time_str, 59);
/* Check day_str. Day must be <1-31>. */
GET_LONG_RANGE (day, day_str, 1, 31);