change dd_opendir API to return dd pointer (no need to dd_init it separately)

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

5 files changed, 27 insertions, 27 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;
diff --git a/src/daemon/abrt-action-analyze-c.c b/src/daemon/abrt-action-analyze-c.c
index 08d6facc..de454daf 100644
--- a/src/daemon/abrt-action-analyze-c.c
+++ b/src/daemon/abrt-action-analyze-c.c
@@ -47,8 +47,8 @@ static void create_hash(char hash_str[SHA1_RESULT_LEN*2 + 1], const char *pInput
 
 static char *run_unstrip_n(const char *dump_dir_name, unsigned timeout_sec)
 {
-    struct dump_dir *dd = dd_init();
-    if (!dd_opendir(dd, dump_dir_name, DD_CLOSE_ON_OPEN_ERR))
+    struct dump_dir *dd = dd_opendir(dump_dir_name, /*flags:*/ 0);
+    if (!dd)
         return NULL;
     char *uid_str = dd_load_text(dd, CD_UID);
     dd_close(dd);
@@ -189,8 +189,8 @@ int main(int argc, char **argv)
 
     /* Hash package + executable + unstrip_n_output and save it as UUID */
 
-    struct dump_dir *dd = dd_init();
-    if (!dd_opendir(dd, dump_dir_name, DD_CLOSE_ON_OPEN_ERR))
+    struct dump_dir *dd = dd_opendir(dump_dir_name, /*flags:*/ 0);
+    if (!dd)
         return 1;
 
     char *executable = dd_load_text(dd, FILENAME_EXECUTABLE);
diff --git a/src/daemon/abrt-action-bugzilla.cpp b/src/daemon/abrt-action-bugzilla.cpp
index c7768556..6c989ea0 100644
--- a/src/daemon/abrt-action-bugzilla.cpp
+++ b/src/daemon/abrt-action-bugzilla.cpp
@@ -569,8 +569,8 @@ static void report_to_bugzilla(
                 const char *dump_dir_name,
                 /*const*/ map_plugin_settings_t& settings)
 {
-    struct dump_dir *dd = dd_init();
-    if (!dd_opendir(dd, dump_dir_name, DD_CLOSE_ON_OPEN_ERR))
+    struct dump_dir *dd = dd_opendir(dump_dir_name, /*flags:*/ 0);
+    if (!dd)
     {
         throw CABRTException(EXCEP_PLUGIN, _("Can't open '%s'"), dump_dir_name);
     }
diff --git a/src/daemon/abrt-action-generate-backtrace.c b/src/daemon/abrt-action-generate-backtrace.c
index ac432a8e..9e4fc078 100644
--- a/src/daemon/abrt-action-generate-backtrace.c
+++ b/src/daemon/abrt-action-generate-backtrace.c
@@ -285,8 +285,8 @@ int main(int argc, char **argv)
         logmode = LOGMODE_SYSLOG;
     }
 
-    struct dump_dir *dd = dd_init();
-    if (!dd_opendir(dd, dump_dir_name, DD_CLOSE_ON_OPEN_ERR))
+    struct dump_dir *dd = dd_opendir(dump_dir_name, /*flags:*/ 0);
+    if (!dd)
         return 1;
 
     char *package = dd_load_text(dd, FILENAME_PACKAGE);
@@ -301,8 +301,8 @@ int main(int argc, char **argv)
         VERB3 log("get_backtrace() returns NULL, broken core/gdb?");
     }
 
-    dd = dd_init();
-    if (!dd_opendir(dd, dump_dir_name, DD_CLOSE_ON_OPEN_ERR))
+    dd = dd_opendir(dump_dir_name, /*flags:*/ 0);
+    if (!dd)
         return 1;
 
     dd_save_text(dd, FILENAME_BACKTRACE, backtrace_str);
diff --git a/src/daemon/abrt-action-save-package-data.cpp b/src/daemon/abrt-action-save-package-data.cpp
index b0e08fe8..4d397071 100644
--- a/src/daemon/abrt-action-save-package-data.cpp
+++ b/src/daemon/abrt-action-save-package-data.cpp
@@ -78,8 +78,8 @@ static bool is_path_blacklisted(const char *path)
 
 static int SavePackageDescriptionToDebugDump(const char *dump_dir_name)
 {
-    struct dump_dir *dd = dd_init();
-    if (!dd_opendir(dd, dump_dir_name, DD_CLOSE_ON_OPEN_ERR))
+    struct dump_dir *dd = dd_opendir(dump_dir_name, /*flags:*/ 0);
+    if (!dd)
         return 1;
 
     char *remote_str = dd_load_text(dd, FILENAME_REMOTE);
@@ -122,8 +122,8 @@ static int SavePackageDescriptionToDebugDump(const char *dump_dir_name)
             if (g_settings_bProcessUnpackaged || remote)
             {
                 VERB2 log("Crash in unpackaged executable '%s', proceeding without packaging information", executable);
-                dd = dd_init();
-                if (!dd_opendir(dd, dump_dir_name, DD_CLOSE_ON_OPEN_ERR))
+                dd = dd_opendir(dump_dir_name, /*flags:*/ 0);
+                if (!dd)
                     goto ret; /* return 1 (failure) */
                 dd_save_text(dd, FILENAME_PACKAGE, "");
                 dd_save_text(dd, FILENAME_DESCRIPTION, "Crashed executable does not belong to any installed package");
@@ -224,8 +224,8 @@ static int SavePackageDescriptionToDebugDump(const char *dump_dir_name)
         component = rpm_get_component(executable);
         dsc = rpm_get_description(package_short_name);
 
-        dd = dd_init();
-        if (!dd_opendir(dd, dump_dir_name, DD_CLOSE_ON_OPEN_ERR))
+        dd = dd_opendir(dump_dir_name, /*flags:*/ 0);
+        if (!dd)
             goto ret; /* return 1 (failure) */
     }