aboutsummaryrefslogtreecommitdiffstats
path: root/src/io.c
diff options
context:
space:
mode:
authorLukas Fleischer <calcurse@cryptocrack.de>2011-04-14 12:49:44 +0200
committerLukas Fleischer <calcurse@cryptocrack.de>2011-04-19 11:42:34 +0200
commitbf431d6cd9411714f849050a10071dc0fe0d7741 (patch)
tree9f97ddbc64b46e3e669794e1c2a0f15355ee99b4 /src/io.c
parent6f883c0f3f4c08fe8e125f269da9b940519ccf44 (diff)
downloadcalcurse-bf431d6cd9411714f849050a10071dc0fe0d7741.tar.gz
calcurse-bf431d6cd9411714f849050a10071dc0fe0d7741.zip
Use generic lists for todo items.
Use the new generic list implementation instead of "next" pointers in todo items. Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
Diffstat (limited to 'src/io.c')
-rw-r--r--src/io.c31
1 files changed, 17 insertions, 14 deletions
diff --git a/src/io.c b/src/io.c
index 2e6fcf1..d6f6565 100644
--- a/src/io.c
+++ b/src/io.c
@@ -637,16 +637,17 @@ pcal_export_apoints (FILE *stream)
static void
ical_export_todo (FILE *stream)
{
- struct todo *i;
+ llist_item_t *i;
- for (i = todolist; i != NULL; i = i->next)
+ LLIST_FOREACH (&todolist, i)
{
- if (i->id < 0) /* completed items */
+ struct todo *todo = LLIST_TS_GET_DATA (i);
+ if (todo->id < 0) /* completed items */
continue;
(void)fprintf (stream, "BEGIN:VTODO\n");
- (void)fprintf (stream, "PRIORITY:%d\n", i->id);
- (void)fprintf (stream, "SUMMARY:%s\n", i->mesg);
+ (void)fprintf (stream, "PRIORITY:%d\n", todo->id);
+ (void)fprintf (stream, "SUMMARY:%s\n", todo->mesg);
(void)fprintf (stream, "END:VTODO\n");
}
}
@@ -654,16 +655,17 @@ ical_export_todo (FILE *stream)
static void
pcal_export_todo (FILE *stream)
{
- struct todo *i;
+ llist_item_t *i;
(void)fprintf (stream, "#\n# Todos\n#\n");
- for (i = todolist; i != NULL; i = i->next)
+ LLIST_FOREACH (&todolist, i)
{
- if (i->id < 0) /* completed items */
+ struct todo *todo = LLIST_TS_GET_DATA (i);
+ if (todo->id < 0) /* completed items */
continue;
(void)fprintf (stream, "note all ");
- (void)fprintf (stream, "%d. %s\n", i->id, i->mesg);
+ (void)fprintf (stream, "%d. %s\n", todo->id, todo->mesg);
}
(void)fprintf (stream, "\n");
}
@@ -999,18 +1001,19 @@ io_save_apts (void)
unsigned
io_save_todo (void)
{
- struct todo *t;
+ llist_item_t *i;
FILE *fp;
if ((fp = fopen (path_todo, "w")) == NULL)
return 0;
- for (t = todolist; t != NULL; t = t->next)
+ LLIST_FOREACH (&todolist, i)
{
- if (t->note)
- (void)fprintf (fp, "[%d]>%s %s\n", t->id, t->note, t->mesg);
+ struct todo *todo = LLIST_TS_GET_DATA (i);
+ if (todo->note)
+ (void)fprintf (fp, "[%d]>%s %s\n", todo->id, todo->note, todo->mesg);
else
- (void)fprintf (fp, "[%d] %s\n", t->id, t->mesg);
+ (void)fprintf (fp, "[%d] %s\n", todo->id, todo->mesg);
}
file_close (fp, __FILE_POS__);