From 71234ec0bd16c490239eefcf98069ceb7a7f7618 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Wed, 16 Jul 2014 23:53:30 +0200 Subject: Refactor wins_launch_external() Allow for passing an arbitrary number of arguments. This also allows us to remove wins_launch_external2() and use wins_launch_external() at all call sites instead. Signed-off-by: Lukas Fleischer --- src/calcurse.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/calcurse.c') diff --git a/src/calcurse.c b/src/calcurse.c index cfe8298..e31770c 100644 --- a/src/calcurse.c +++ b/src/calcurse.c @@ -290,10 +290,13 @@ static inline void key_generic_reload(void) io_save_todo(path_todo_backup); io_save_mutex_unlock(); - wins_launch_external2(path_apts, path_apts_backup, - conf.mergetool); - wins_launch_external2(path_todo, path_todo_backup, - conf.mergetool); + const char *arg_apts[] = { conf.mergetool, path_apts, + path_apts_backup, NULL }; + wins_launch_external(arg_apts); + + const char *arg_todo[] = { conf.mergetool, path_todo, + path_todo_backup, NULL }; + wins_launch_external(arg_todo); xfree(path_apts_backup); xfree(path_todo_backup); -- cgit v1.2.3-54-g00ecf