/*
* Copyright (C) 2012 Andy Spencer <andy753421@gmail.com>
- *
+ *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
.end = iend,
});
}
+
+ icalrecur_iterator_free(iter);
}
/* Add children */
{
icalproperty *prop = icalcomponent_get_first_property(inst->comp, ICAL_CATEGORIES_PROPERTY);
- event_t *event = calloc(1, sizeof(event_t));
- event->name = icalcomponent_get_summary(inst->comp);
- event->desc = icalcomponent_get_description(inst->comp);
- event->loc = icalcomponent_get_location(inst->comp);
+ event_t *event = new0(event_t);
+ event->name = strcopy(icalcomponent_get_summary(inst->comp));
+ event->desc = strcopy(icalcomponent_get_description(inst->comp));
+ event->loc = strcopy(icalcomponent_get_location(inst->comp));
event->cat = icalproperty_get_value_as_string_r(prop);
event->start = to_date(inst->start);
event->end = to_date(inst->end);
icalproperty *cat = icalcomponent_get_first_property(inst->comp, ICAL_CATEGORIES_PROPERTY);
icalproperty *perc = icalcomponent_get_first_property(inst->comp, ICAL_PERCENTCOMPLETE_PROPERTY);
- todo_t *todo = calloc(1, sizeof(todo_t));
- todo->name = icalcomponent_get_summary(inst->comp);
- todo->desc = icalcomponent_get_description(inst->comp);
- todo->cat = icalproperty_get_value_as_string(cat);
+ todo_t *todo = new0(todo_t);
+ todo->name = strcopy(icalcomponent_get_summary(inst->comp));
+ todo->desc = strcopy(icalcomponent_get_description(inst->comp));
+ todo->cat = strcopy(icalproperty_get_value_as_string(cat));
todo->status = icalcomponent_get_status(inst->comp) == ICAL_STATUS_COMPLETED ? 100 :
perc ? icalproperty_get_percentcomplete(perc) : 0;
todo->start = to_date(inst->start);
icalparser *parser = icalparser_new();
icalparser_set_gen_data(parser, file);
icalcomponent *ical = icalparser_parse(parser, (void*)fgets);
+ icalparser_free(parser);
/* Add events */
icalarray *array = icalarray_new(sizeof(ical_inst), 1);
icaltimetype end = {.year = 2020};
add_recur(array, ical, start, end, ICAL_VEVENT_COMPONENT);
icalarray_sort(array, ical_compare);
- return to_events(array);
+ event_t *events = to_events(array);
+ icalarray_free(array);
+ icalcomponent_free(ical);
- /* Todo, memory management */
+ return events;
}
/* Todo functions */
icalparser *parser = icalparser_new();
icalparser_set_gen_data(parser, file);
icalcomponent *ical = icalparser_parse(parser, (void*)fgets);
+ icalparser_free(parser);
/* Add todos */
icalarray *array = icalarray_new(sizeof(ical_inst), 1);
icaltimetype end = {.year = 2020};
add_recur(array, ical, start, end, ICAL_VTODO_COMPONENT);
icalarray_sort(array, ical_compare);
- return to_todos(array);
+ todo_t *todos = to_todos(array);
+ icalarray_free(array);
+ icalcomponent_free(ical);
- /* Todo, memory management */
+ return todos;
}
/* Test functions */
add_recur(array, ical, start, end, ICAL_VEVENT_COMPONENT);
icalarray_sort(array, ical_compare);
event_t *events = to_events(array);
+ icalarray_free(array);
/* Find Todos */
array = icalarray_new(sizeof(ical_inst), 1);
add_recur(array, ical, start, end, ICAL_VTODO_COMPONENT);
icalarray_sort(array, ical_compare);
todo_t *todos = to_todos(array);
+ icalarray_free(array);
/* Print */
//ical_printr(ical, 0);