From b3ad2fb990b193906c3243673ac15b056eb148dc Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 17 May 2011 15:51:53 +0200 Subject: smart_event.conf: suppress stray output of "which" command Also, fix some typos in comments Signed-off-by: Denys Vlasenko --- src/cli/report.c | 2 +- src/daemon/smart_event.conf | 6 +++--- src/gui-wizard-gtk/wizard.c | 4 ++-- src/include/report/run_event.h | 4 ++-- src/lib/abrt_dbus.h | 2 +- src/lib/run_event.c | 6 ++---- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/cli/report.c b/src/cli/report.c index 7f722480..9e0455be 100644 --- a/src/cli/report.c +++ b/src/cli/report.c @@ -788,7 +788,7 @@ int report(const char *dump_dir_name, int flags) if (!config) VERB1 log("No configuration file found for '%s' reporter", reporter_name); - + /* Was this reporter requested? */ if (!is_number_in_string(i, wanted_reporters)) continue; diff --git a/src/daemon/smart_event.conf b/src/daemon/smart_event.conf index e4b96b91..9c23862b 100644 --- a/src/daemon/smart_event.conf +++ b/src/daemon/smart_event.conf @@ -14,7 +14,7 @@ # when program selection code looks at this file. EVENT=post-create component=gnome-disk-utility - which skdump 2>/dev/null || exit 0 + which skdump >/dev/null 2>&1 || exit 0 for f in /dev/[sh]d[a-z]; do test -e "$f" || continue skdump "$f" @@ -22,7 +22,7 @@ EVENT=post-create component=gnome-disk-utility done >smart_data EVENT=post-create component=libatasmart - which skdump 2>/dev/null || exit 0 + which skdump >/dev/null 2>&1 || exit 0 for f in /dev/[sh]d[a-z]; do test -e "$f" || continue skdump "$f" @@ -30,7 +30,7 @@ EVENT=post-create component=libatasmart done >smart_data EVENT=post-create component=udisks - which skdump 2>/dev/null || exit 0 + which skdump >/dev/null 2>&1 || exit 0 for f in /dev/[sh]d[a-z]; do test -e "$f" || continue skdump "$f" diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c index dc6de107..426dfb8a 100644 --- a/src/gui-wizard-gtk/wizard.c +++ b/src/gui-wizard-gtk/wizard.c @@ -971,8 +971,8 @@ static void start_event_run(const char *event_name, const char *start_msg, const char *end_msg ) { - /* Start event asyncronously on the dump dir - * (syncronous run would freeze GUI until completion) + /* Start event asynchronously on the dump dir + * (synchronous run would freeze GUI until completion) */ struct run_event_state *state = new_run_event_state(); diff --git a/src/include/report/run_event.h b/src/include/report/run_event.h index 8bd86543..12528920 100644 --- a/src/include/report/run_event.h +++ b/src/include/report/run_event.h @@ -48,7 +48,7 @@ struct run_event_state { struct run_event_state *new_run_event_state(void); void free_run_event_state(struct run_event_state *state); -/* Asyncronous command execution */ +/* Asynchronous command execution */ /* Returns 0 if no commands found for this dump_dir_name+event, else >0 */ int prepare_commands(struct run_event_state *state, const char *dump_dir_name, const char *event); @@ -59,7 +59,7 @@ int spawn_next_command(struct run_event_state *state, const char *dump_dir_name, /* Cleans up internal state created in prepare_commands */ void free_commands(struct run_event_state *state); -/* Syncronous command execution */ +/* Synchronous command execution */ /* Returns exit code of first failed action, or first nonzero return value * of post_run_callback. If all actions are successful, returns 0. diff --git a/src/lib/abrt_dbus.h b/src/lib/abrt_dbus.h index 37d12756..b7e7b566 100644 --- a/src/lib/abrt_dbus.h +++ b/src/lib/abrt_dbus.h @@ -50,7 +50,7 @@ extern DBusConnection* g_dbus_conn; * conn = dbus_bus_get(DBUS_BUS_SYSTEM/SESSION, &err); * // needed only if you need to use async dbus calls (not shown below): * attach_dbus_conn_to_glib_main_loop(conn, NULL, NULL); - * // syncronous method call: + * // synchronous method call: * msg = dbus_message_new_method_call("some.serv", "/path/on/serv", "optional.iface.on.serv", "method_name"); * reply = dbus_connection_send_with_reply_and_block(conn, msg, timeout, &err); * // emitting signal: diff --git a/src/lib/run_event.c b/src/lib/run_event.c index e577c383..883dc6d0 100644 --- a/src/lib/run_event.c +++ b/src/lib/run_event.c @@ -34,10 +34,10 @@ void free_run_event_state(struct run_event_state *state) } -/* Asyncronous command execution */ +/* Asynchronous command execution */ /* It is not yet clear whether we need to re-parse event config file - * and re-check the elements in dump dir after each comamnd. + * and re-check the elements in dump dir after each command. * * Consider this config file: * @@ -322,9 +322,7 @@ int run_event_on_dir_name(struct run_event_state *state, if (WIFSIGNALED(status)) retval = WTERMSIG(status) + 128; if (retval != 0) - { break; - } if (state->post_run_callback) { -- cgit