Merge branch 'master' of https://gitea.fhgr.ch/schurtisimon/StudyPlanner
modified: Makefile modified: src/db.c modified: src/db.h
This commit is contained in:
commit
42183a0747
9 files changed
+175
-16
No files matched your search
@@ -37,9 +37,8 @@ void write_linkedlist_to_csv(llist *head, const char *filename) {
|
||||
Task *task;
|
||||
while (current != NULL) {
|
||||
task = current->data;
|
||||
|
||||
// Write the task data to the CSV file
|
||||
fprintf(file, "%s, %lu, %lu, %d, %lu\n", task->name, task->created,
|
||||
fprintf(file, "%s, %llu, %llu, %d, %llu\n", task->name, task->created,
|
||||
task->deadline, task->priority, task->spare);
|
||||
|
||||
current = current->next;
|
||||
@@ -97,7 +96,6 @@ llist *write_csv_to_llist(const char *filename) {
|
||||
llistAppend(list, task);
|
||||
}
|
||||
}
|
||||
|
||||
fclose(file);
|
||||
}
|
||||
return list; // null on error
|
||||
|
||||
@@ -5,5 +5,10 @@
|
||||
|
||||
#endif
|
||||
|
||||
<<<<<<< HEAD
|
||||
void write_linkedlist_to_csv(llist *head, const char *filename);
|
||||
llist *write_csv_to_llist(const char *filename);
|
||||
=======
|
||||
extern void write_linkedlist_to_csv(llist* head, const char* filename);
|
||||
extern void write_csv_to_llist(const char* filename);
|
||||
>>>>>>> 9d903f62f26133fd6f309036b3da11400168e705
|
||||
Reference in new issue
Block a user