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

ical.c: Small refactoring

Browse Source 
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2015-02-25 16:19:14 +01:00
parent 8c82fc3f6d
commit 90e6c61252
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ical.c
View File

@ -126,10 +126,7 @@ static void ical_export_recur_events(FILE * stream)
date_sec2date_fmt(exc->st, ICALDATEFMT, date_sec2date_fmt(exc->st, ICALDATEFMT,
ical_date); ical_date);
fprintf(stream, "%s", ical_date); fprintf(stream, "%s", ical_date);
if (LLIST_NEXT(j)) fputc(LLIST_NEXT(j) ? ',' : '\n', stream);
fputc(',', stream);
else
fputc('\n', stream);
} }
} }
@ -188,10 +185,7 @@ static void ical_export_recur_apoints(FILE * stream)
date_sec2date_fmt(exc->st, ICALDATEFMT, date_sec2date_fmt(exc->st, ICALDATEFMT,
ical_date); ical_date);
fprintf(stream, "%s", ical_date); fprintf(stream, "%s", ical_date);
if (LLIST_NEXT(j)) fputc(LLIST_NEXT(j) ? ',' : '\n', stream);
fputc(',', stream);
else
fputc('\n', stream);
} }
} }
@ -281,8 +275,10 @@ static void ical_log(FILE * log, ical_types_e type, unsigned lineno,
const char *typestr[ICAL_TYPES] = { "VEVENT", "VTODO" }; const char *typestr[ICAL_TYPES] = { "VEVENT", "VTODO" };
RETURN_IF(type < 0 || type >= ICAL_TYPES, _("unknown ical type")); RETURN_IF(type < 0 || type >= ICAL_TYPES, _("unknown ical type"));
if (log) if (!log)
fprintf(log, "%s [%d]: %s\n", typestr[type], lineno, msg); return;
fprintf(log, "%s [%d]: %s\n", typestr[type], lineno, msg);
} }
static void ical_store_todo(int priority, char *mesg, char *note) static void ical_store_todo(int priority, char *mesg, char *note)
@ -487,7 +483,6 @@ static time_t ical_datetime2time_t(char *datestr, ical_vevent_e * type)
struct date date; struct date date;
unsigned hour, min, sec; unsigned hour, min, sec;
char c; char c;
time_t t = 0;
int format; int format;
format = sscanf(datestr, "%04u%02u%02uT%02u%02u%02u%c", format = sscanf(datestr, "%04u%02u%02uT%02u%02u%02u%c",
@ -495,16 +490,16 @@ static time_t ical_datetime2time_t(char *datestr, ical_vevent_e * type)
if (format == FORMAT_DATE) { if (format == FORMAT_DATE) {
if (type) if (type)
*type = EVENT; *type = EVENT;
t = date2sec(date, 0, 0); return date2sec(date, 0, 0);
} else if (format == FORMAT_DATETIME || format == FORMAT_DATETIMEZ) { } else if (format == FORMAT_DATETIME || format == FORMAT_DATETIMEZ) {
if (type) if (type)
*type = APPOINTMENT; *type = APPOINTMENT;
if (format == FORMAT_DATETIMEZ && c == 'Z') if (format == FORMAT_DATETIMEZ && c == 'Z')
t = utcdate2sec(date, hour, min); return utcdate2sec(date, hour, min);
else else
t = date2sec(date, hour, min); return date2sec(date, hour, min);
} }
return t; return 0;
} }
static long ical_durtime2long(char *timestr) static long ical_durtime2long(char *timestr)