fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use LONG_MAX for invalid dates in parse_datearg()

Browse Source 
We cannot use -1 here since negative values are valid dates.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2015-02-22 11:13:57 +01:00
parent c84c911f5b
commit a6c73232a8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/args.c
View File

@ -326,7 +326,7 @@ static long parse_datearg(const char *str)
(int *)&day.mm, (int *)&day.dd, NULL)) (int *)&day.mm, (int *)&day.dd, NULL))
return date2sec(day, 0, 0); return date2sec(day, 0, 0);
return -1; return LONG_MAX;
} }
static long parse_datetimearg(const char *str) static long parse_datetimearg(const char *str)
@ -345,7 +345,7 @@ static long parse_datetimearg(const char *str)
if (!parse_time(time, &hour, &min)) if (!parse_time(time, &hour, &min))
return -1; return -1;
ret = parse_datearg(date); ret = parse_datearg(date);
if (!ret) if (ret == LONG_MAX)
return -1; return -1;
ret += hour * HOURINSEC + min * MININSEC; ret += hour * HOURINSEC + min * MININSEC;
@ -353,7 +353,7 @@ static long parse_datetimearg(const char *str)
} }
ret = parse_datearg(date); ret = parse_datearg(date);
if (ret < 0) { if (ret == LONG_MAX) {
/* No date specified, use time only. */ /* No date specified, use time only. */
if (!parse_time(date, &hour, &min)) if (!parse_time(date, &hour, &min))
return -1; return -1;