From 70cd5dc1dcd5c75c98494807f5e4775260212ff6 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Wed, 4 Dec 2013 20:34:22 +0000 Subject: [PATCH] improved log --- src/log.c | 2 +- src/log.h | 7 ++++--- src/main.c | 2 +- src/ui.c | 2 +- src/ui_taskpanel.c | 8 ++++---- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/log.c b/src/log.c index c365215..0b42fb8 100644 --- a/src/log.c +++ b/src/log.c @@ -163,7 +163,7 @@ void log_info(const char *fmt, ...) va_end(ap); } -void log_fct(const char *fct, const char *fmt, ...) +void _log(const char *fct, const char *fmt, ...) { va_list ap; diff --git a/src/log.h b/src/log.h index c887446..b95170a 100644 --- a/src/log.h +++ b/src/log.h @@ -35,10 +35,11 @@ void log_err(const char *fmt, ...); void log_info(const char *fmt, ...); void log_warn(const char *fmt, ...); -void log_fct(const char *fct, const char *fmt, ...); +void _log(const char *fct, const char *fmt, ...); -#define log_fct_enter() log_fct(__func__, "ENTER"); -#define log_fct_exit() log_fct(__func__, "EXIT"); +#define log_fct(...) _log(__func__, __VA_ARGS__) +#define log_fct_enter() log_fct("ENTER") +#define log_fct_exit() log_fct("EXIT") /* level of the log file. */ extern int log_level; diff --git a/src/main.c b/src/main.c index d54e623..4192965 100644 --- a/src/main.c +++ b/src/main.c @@ -134,7 +134,7 @@ void refresh() if (old_tasks) tw_task_list_free(old_tasks); - log_fct(__func__, "EXIT"); + log_fct_exit(); } static int cursor_changed_cbk(GtkTreeView *treeview, gpointer data) diff --git a/src/ui.c b/src/ui.c index 3a3f7bc..4eeb4f2 100644 --- a/src/ui.c +++ b/src/ui.c @@ -119,7 +119,7 @@ const char *ui_get_status_filter() log_fct_enter(); status = gtk_combo_box_get_active_id(w_status); - log_fct(__func__, "status: %d", status); + log_fct("status: %d", status); log_fct_exit(); diff --git a/src/ui_taskpanel.c b/src/ui_taskpanel.c index 675a0a1..91f3c54 100644 --- a/src/ui_taskpanel.c +++ b/src/ui_taskpanel.c @@ -75,7 +75,7 @@ static int tasksave_clicked_cbk(GtkButton *btn, gpointer data) task = current_task; - log_fct(__func__, "%d", task->id); + log_fct("%d", task->id); buf = gtk_text_view_get_buffer(w_note); @@ -123,7 +123,7 @@ static int tasksave_clicked_cbk(GtkButton *btn, gpointer data) void ui_taskpanel_init(GtkBuilder *builder) { - log_fct(__func__, "ENTER"); + log_fct("ENTER"); w_note = GTK_TEXT_VIEW(gtk_builder_get_object(builder, "tasknote")); @@ -150,7 +150,7 @@ void ui_taskpanel_init(GtkBuilder *builder) enable(0); - log_fct(__func__, "EXIT"); + log_fct("EXIT"); } static int priority_to_int(const char *str) @@ -215,7 +215,7 @@ int taskremove_clicked_cbk(GtkButton *btn, gpointer data) log_fct_enter(); if (current_task) { - log_fct(__func__, "uuid=%d", current_task->uuid); + log_fct("uuid=%d", current_task->uuid); tw_task_remove(current_task->uuid); refresh(); } -- 2.7.4