From 8553a991611d354e2b1e9d60a261c5226aa0141a Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Fri, 10 Oct 2014 01:38:25 +0200 Subject: Add io_load_data() wrapper Signed-off-by: Lukas Fleischer --- src/args.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src/args.c') diff --git a/src/args.c b/src/args.c index 2d5bea4..e6ba6e0 100644 --- a/src/args.c +++ b/src/args.c @@ -747,8 +747,7 @@ int parse_args(int argc, char **argv) io_check_file(path_conf); vars_init(); config_load(); /* To get output date format. */ - io_load_app(&filter); - io_load_todo(&filter); + io_load_data(&filter); io_save_todo(NULL); io_save_apts(NULL); } else if (query) { @@ -757,8 +756,7 @@ int parse_args(int argc, char **argv) io_check_file(path_conf); vars_init(); config_load(); /* To get output date format. */ - io_load_app(&filter); - io_load_todo(&filter); + io_load_data(&filter); int add_line = todo_arg(fmt_todo, &limit, &filter); date_arg_from_to(from, to, add_line, fmt_apt, fmt_rapt, fmt_ev, fmt_rev, &limit); @@ -769,24 +767,21 @@ int parse_args(int argc, char **argv) } else if (gc) { io_check_file(path_apts); io_check_file(path_todo); - io_load_app(NULL); - io_load_todo(NULL); + io_load_data(NULL); note_gc(); } else if (import) { io_check_file(path_apts); io_check_file(path_todo); /* Get default pager in case we need to show a log file. */ vars_init(); - io_load_app(NULL); - io_load_todo(NULL); + io_load_data(NULL); io_import_data(IO_IMPORT_ICAL, ifile); io_save_apts(path_apts); io_save_todo(path_todo); } else if (export) { io_check_file(path_apts); io_check_file(path_todo); - io_load_app(&filter); - io_load_todo(&filter); + io_load_data(&filter); io_export_data(xfmt); } else { /* interactive mode */ -- cgit v1.2.3-54-g00ecf