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

ical: Refactor item date/time parser

Browse Source 
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lukas Fleischer 2016-01-13 18:06:22 +01:00
parent 56f615ffe2
commit 2c4a650dbe
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ical.c
View File

@ -529,14 +529,14 @@ static time_t ical_datetime2time_t(char *datestr, ical_vevent_e * type)
static long ical_durtime2long(char *timestr) static long ical_durtime2long(char *timestr)
{ {
char *p; char *p = timestr;
int bytes_read; int bytes_read;
unsigned hour = 0, min = 0, sec = 0; unsigned hour = 0, min = 0, sec = 0;
if ((p = strchr(timestr, 'T')) == NULL) if (*p != 'T')
return 0; return 0;
p++; p++;
if (strchr(p, 'H')) { if (strchr(p, 'H')) {
if (sscanf(p, "%uH%n", &hour, &bytes_read) != 1) if (sscanf(p, "%uH%n", &hour, &bytes_read) != 1)
return 0; return 0;
@ -548,14 +548,11 @@ static long ical_durtime2long(char *timestr)
p += bytes_read; p += bytes_read;
} }
if (strchr(p, 'S')) { if (strchr(p, 'S')) {
if (sscanf(p, "%uM%n", &sec, &bytes_read) != 1) if (sscanf(p, "%uS%n", &sec, &bytes_read) != 1)
return 0; return 0;
p += bytes_read; p += bytes_read;
} }
if (hour == 0 && min == 0 && sec == 0)
return 0;
return hour * HOURINSEC + min * MININSEC + sec; return hour * HOURINSEC + min * MININSEC + sec;
} }
@ -587,6 +584,7 @@ static long ical_durtime2long(char *timestr)
static long ical_dur2long(char *durstr) static long ical_dur2long(char *durstr)
{ {
char *p; char *p;
int bytes_read;
struct { struct {
unsigned week, day; unsigned week, day;
} date; } date;
@ -612,9 +610,9 @@ static long ical_dur2long(char *durstr)
return date.week * WEEKINDAYS * DAYINSEC; return date.week * WEEKINDAYS * DAYINSEC;
} else if (strchr(p, 'D')) { } else if (strchr(p, 'D')) {
/* dur-date */ /* dur-date */
if (sscanf(p, "%uD", &date.day) == 1) { if (sscanf(p, "%uD%n", &date.day, &bytes_read) == 1) {
return date.day * DAYINSEC + p += bytes_read;
ical_durtime2long(p); return date.day * DAYINSEC + ical_durtime2long(p);
} }
} }