diff options
| author | Denys Vlasenko <dvlasenk@redhat.com> | 2010-10-15 18:33:14 +0200 |
|---|---|---|
| committer | Denys Vlasenko <dvlasenk@redhat.com> | 2010-10-15 18:33:14 +0200 |
| commit | 46585e67644ad8edf16ff8db5602cea325a975e5 (patch) | |
| tree | 5739256404e8193abb219c42f6e291b21f947881 /src/daemon/MiddleWare.cpp | |
| parent | 9d9a9dd41313ed5d2e544bb3bcdf08dab6f38a48 (diff) | |
| download | abrt-46585e67644ad8edf16ff8db5602cea325a975e5.tar.gz abrt-46585e67644ad8edf16ff8db5602cea325a975e5.tar.xz abrt-46585e67644ad8edf16ff8db5602cea325a975e5.zip | |
change dd_opendir API to return dd pointer (no need to dd_init it separately)
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'src/daemon/MiddleWare.cpp')
| -rw-r--r-- | src/daemon/MiddleWare.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp index f499f3b7..9e7f96ab 100644 --- a/src/daemon/MiddleWare.cpp +++ b/src/daemon/MiddleWare.cpp @@ -64,8 +64,8 @@ static bool DebugDumpToCrashReport(const char *pDebugDumpDir, map_crash_data_t& { VERB3 log(" DebugDumpToCrashReport('%s')", pDebugDumpDir); - struct dump_dir *dd = dd_init(); - if (!dd_opendir(dd, pDebugDumpDir, DD_CLOSE_ON_OPEN_ERR)) + struct dump_dir *dd = dd_opendir(pDebugDumpDir, /*flags:*/ 0); + if (!dd) return false; const char *const *v = must_have_files; @@ -177,8 +177,8 @@ mw_result_t CreateCrashReport(const char *crash_id, mw_result_t r = MW_OK; try { - struct dump_dir *dd = dd_init(); - if (!dd_opendir(dd, row->db_dump_dir, DD_CLOSE_ON_OPEN_ERR)) + struct dump_dir *dd = dd_opendir(row->db_dump_dir, /*flags:*/ 0); + if (!dd) { db_row_free(row); return MW_ERROR; @@ -333,8 +333,8 @@ report_status_t Report(const map_crash_data_t& client_report, const char *backtrace = get_crash_data_item_content_or_NULL(client_report, FILENAME_BACKTRACE); if (comment || reproduce || backtrace) { - struct dump_dir *dd = dd_init(); - if (dd_opendir(dd, pDumpDir.c_str(), 0)) + struct dump_dir *dd = dd_opendir(pDumpDir.c_str(), /*flags:*/ 0); + if (dd) { if (comment) { @@ -351,8 +351,8 @@ report_status_t Report(const map_crash_data_t& client_report, dd_save_text(dd, FILENAME_BACKTRACE, backtrace); add_to_crash_data_ext(stored_report, FILENAME_BACKTRACE, CD_TXT, CD_ISEDITABLE, backtrace); } + dd_close(dd); } - dd_close(dd); } /* Remove BIN filenames from stored_report if they are not present in client's data */ @@ -700,8 +700,8 @@ mw_result_t SaveDebugDump(const char *pDebugDumpDir, { mw_result_t res; - struct dump_dir *dd = dd_init(); - if (!dd_opendir(dd, pDebugDumpDir, DD_CLOSE_ON_OPEN_ERR)) + struct dump_dir *dd = dd_opendir(pDebugDumpDir, /*flags:*/ 0); + if (!dd) return MW_ERROR; char *time = dd_load_text(dd, FILENAME_TIME); @@ -770,8 +770,8 @@ mw_result_t FillCrashInfo(const char *crash_id, if (!row) return MW_ERROR; - struct dump_dir *dd = dd_init(); - if (!dd_opendir(dd, row->db_dump_dir, DD_CLOSE_ON_OPEN_ERR)) + struct dump_dir *dd = dd_opendir(row->db_dump_dir, /*flags:*/ 0); + if (!dd) { db_row_free(row); return MW_ERROR; |