From dba326f60e159697a740f08959d098e19c200453 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 22 Dec 2010 16:28:39 +0100 Subject: extend run_event() to run_event_on_dir_name() and run_event_on_crash_data() Signed-off-by: Denys Vlasenko --- src/daemon/MiddleWare.cpp | 12 ++++++------ src/daemon/abrt-handle-crashdump.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/daemon') diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp index 655bda3a..ff2e1a2a 100644 --- a/src/daemon/MiddleWare.cpp +++ b/src/daemon/MiddleWare.cpp @@ -79,7 +79,7 @@ static crash_data_t *DebugDumpToCrashReport(const char *dump_dir_name) v++; } - crash_data_t *crash_data = load_crash_data_from_dump_dir(dd); + crash_data_t *crash_data = create_crash_data_from_dump_dir(dd); char *events = list_possible_events(dd, NULL, ""); dd_close(dd); @@ -154,7 +154,7 @@ static mw_result_t CreateCrashReport(const char *dump_dir_name, run_state = new_run_event_state(); run_state->logging_callback = do_log_and_update_client; - res = run_event(run_state, dump_dir_name, force ? "reanalyze" : "analyze"); + res = run_event_on_dir_name(run_state, dump_dir_name, force ? "reanalyze" : "analyze"); free_run_event_state(run_state); if (res != 0 && res != -1) /* -1 is "nothing was done", here it is ok */ { @@ -162,7 +162,7 @@ static mw_result_t CreateCrashReport(const char *dump_dir_name, goto ret; } - /* Do a load_crash_data_from_dump_dir from (possibly updated) + /* Do a create_crash_data_from_dump_dir from (possibly updated) * crash dump dir */ *crash_data = DebugDumpToCrashReport(dump_dir_name); @@ -336,7 +336,7 @@ report_status_t Report(crash_data_t *client_report, std::string event = events[i]; l_state.last_line = NULL; - int r = run_event(run_state, dump_dir_name, event.c_str()); + int r = run_event_on_dir_name(run_state, dump_dir_name, event.c_str()); if (r == -1) { l_state.last_line = xasprintf("Error: no processing is specified for event '%s'", event.c_str()); @@ -507,7 +507,7 @@ mw_result_t LoadDebugDump(const char *dump_dir_name, crash_data_t **crash_data) run_state->post_run_callback = is_crash_a_dup; run_state->post_run_param = &state; run_state->logging_callback = do_log; - int r = run_event(run_state, dump_dir_name, "post-create"); + int r = run_event_on_dir_name(run_state, dump_dir_name, "post-create"); free_run_event_state(run_state); //TODO: consider this case: @@ -590,7 +590,7 @@ static crash_data_t *FillCrashInfo(const char *dump_dir_name) if (!dd) return NULL; - crash_data_t *crash_data = load_crash_data_from_dump_dir(dd); + crash_data_t *crash_data = create_crash_data_from_dump_dir(dd); char *events = list_possible_events(dd, NULL, ""); dd_close(dd); diff --git a/src/daemon/abrt-handle-crashdump.c b/src/daemon/abrt-handle-crashdump.c index 2217c67a..de809c17 100644 --- a/src/daemon/abrt-handle-crashdump.c +++ b/src/daemon/abrt-handle-crashdump.c @@ -96,7 +96,7 @@ int main(int argc, char **argv) struct run_event_state *run_state = new_run_event_state(); run_state->logging_callback = do_log; - int r = run_event(run_state, dump_dir_name ? dump_dir_name : ".", event); + int r = run_event_on_dir_name(run_state, dump_dir_name ? dump_dir_name : ".", event); if (r == -1) error_msg_and_die("No actions are found for event '%s'", event); free_run_event_state(run_state); -- cgit