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

Implement {apoint,event,todo}_tostr()

Browse Source 
Add functions to serialize non-recurrent objects without immediately
writing them to stdout.

Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lukas Fleischer
2016-01-11 20:02:37 +01:00
parent ab54c861dc
commit d118beceee
4 changed files with 55 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/apoint.c
View File

@@ -136,30 +136,42 @@ void apoint_sec2str(struct apoint *o, long day, char *start, char *end)
}
}
void apoint_write(struct apoint *o, FILE * f)
char *apoint_tostr(struct apoint *o)
{
struct string s;
struct tm lt;
time_t t;
string_init(&s);
t = o->start;
localtime_r(&t, &lt);
fprintf(f, "%02u/%02u/%04u @ %02u:%02u", lt.tm_mon + 1, lt.tm_mday,
1900 + lt.tm_year, lt.tm_hour, lt.tm_min);
string_catf(&s, "%02u/%02u/%04u @ %02u:%02u", lt.tm_mon + 1,
lt.tm_mday, 1900 + lt.tm_year, lt.tm_hour, lt.tm_min);
t = o->start + o->dur;
localtime_r(&t, &lt);
fprintf(f, " -> %02u/%02u/%04u @ %02u:%02u ", lt.tm_mon + 1,
string_catf(&s, " -> %02u/%02u/%04u @ %02u:%02u", lt.tm_mon + 1,
lt.tm_mday, 1900 + lt.tm_year, lt.tm_hour, lt.tm_min);
if (o->note != NULL)
fprintf(f, ">%s ", o->note);
if (o->note)
string_catf(&s, ">%s ", o->note);
if (o->state & APOINT_NOTIFY)
fputc('!', f);
string_catf(&s, "%c", '!');
else
fputc('|', f);
string_catf(&s, "%c", '|');
fprintf(f, "%s\n", o->mesg);
string_catf(&s, "%s", o->mesg);
return string_buf(&s);
}
void apoint_write(struct apoint *o, FILE * f)
{
char *str = apoint_tostr(o);
fprintf(f, "%s\n", str);
mem_free(str);
}
struct apoint *apoint_scan(FILE * f, struct tm start, struct tm end,