unhide dump_dir structure from typedef

no other code changes

Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com>

11 files changed, 50 insertions, 50 deletions

diff --git a/inc/dump_dir.h b/inc/dump_dir.h
index 7d8c3c63..8e65b1f2 100644
--- a/inc/dump_dir.h
+++ b/inc/dump_dir.h
@@ -26,27 +26,27 @@
 extern "C" {
 #endif
 
-typedef struct dump_dir {
+struct dump_dir {
     char *dd_dir;
     DIR *next_dir;
     int locked;
     uid_t dd_uid;
     gid_t dd_gid;
-} dump_dir_t;
+};
 
-dump_dir_t* dd_init(void);
-void dd_close(dump_dir_t *dd);
+struct dump_dir *dd_init(void);
+void dd_close(struct dump_dir *dd);
 
-int dd_opendir(dump_dir_t *dd, const char *dir);
-int dd_exist(dump_dir_t *dd, const char *path);
-int dd_create(dump_dir_t *dd, const char *dir, uid_t uid);
-DIR *dd_init_next_file(dump_dir_t *dd);
-int dd_get_next_file(dump_dir_t *dd, char **short_name, char **full_name);
+int dd_opendir(struct dump_dir *dd, const char *dir);
+int dd_exist(struct dump_dir *dd, const char *path);
+int dd_create(struct dump_dir *dd, const char *dir, uid_t uid);
+DIR *dd_init_next_file(struct dump_dir *dd);
+int dd_get_next_file(struct dump_dir *dd, char **short_name, char **full_name);
 
-char* dd_load_text(const dump_dir_t *dd, const char* name);
-void dd_save_text(dump_dir_t *dd, const char *name, const char *data);
-void dd_save_binary(dump_dir_t* dd, const char* name, const char* data, unsigned size);
-void dd_delete(dump_dir_t *dd);
+char* dd_load_text(const struct dump_dir *dd, const char* name);
+void dd_save_text(struct dump_dir *dd, const char *name, const char *data);
+void dd_save_binary(struct dump_dir* dd, const char* name, const char* data, unsigned size);
+void dd_delete(struct dump_dir *dd);
 
 void delete_debug_dump_dir(const char *dd_dir);
 
diff --git a/lib/plugins/CCpp.cpp b/lib/plugins/CCpp.cpp
index 0fad8f44..bc1707db 100644
--- a/lib/plugins/CCpp.cpp
+++ b/lib/plugins/CCpp.cpp
@@ -153,7 +153,7 @@ static char *get_backtrace(const char *pDebugDumpDir, const char *pDebugInfoDirs
 {
     update_client(_("Generating backtrace"));
 
-    dump_dir_t *dd = dd_init();
+    struct dump_dir *dd = dd_init();
     if (!dd_opendir(dd, pDebugDumpDir))
     {
         dd_close(dd);
@@ -302,7 +302,7 @@ static void GetIndependentBuildIdPC(const char *unstrip_n_output,
 
 static char* run_unstrip_n(const char *pDebugDumpDir, unsigned timeout_sec)
 {
-    dump_dir_t *dd = dd_init();
+    struct dump_dir *dd = dd_init();
     if (!dd_opendir(dd, pDebugDumpDir))
     {
         dd_close(dd);
@@ -496,7 +496,7 @@ static void trim_debuginfo_cache(unsigned max_mb)
 
 string CAnalyzerCCpp::GetLocalUUID(const char *pDebugDumpDir)
 {
-    dump_dir_t *dd = dd_init();
+    struct dump_dir *dd = dd_init();
     if (!dd_opendir(dd, pDebugDumpDir))
     {
         dd_close(dd);
@@ -557,7 +557,7 @@ string CAnalyzerCCpp::GetLocalUUID(const char *pDebugDumpDir)
 
 string CAnalyzerCCpp::GetGlobalUUID(const char *pDebugDumpDir)
 {
-    dump_dir_t *dd = dd_init();
+    struct dump_dir *dd = dd_init();
     if (!dd_opendir(dd, pDebugDumpDir))
     {
         dd_close(dd);
@@ -733,7 +733,7 @@ void CAnalyzerCCpp::CreateReport(const char *pDebugDumpDir, int force)
         return;
     }
 
-    dump_dir_t *dd = dd_init();
+    struct dump_dir *dd = dd_init();
     if (!dd_opendir(dd, pDebugDumpDir))
     {
         dd_close(dd);
diff --git a/lib/plugins/Kerneloops.cpp b/lib/plugins/Kerneloops.cpp
index e12be7e9..0c4b1a56 100644
--- a/lib/plugins/Kerneloops.cpp
+++ b/lib/plugins/Kerneloops.cpp
@@ -125,7 +125,7 @@ std::string CAnalyzerKerneloops::GetLocalUUID(const char *pDebugDumpDir)
 {
     VERB3 log("Getting local universal unique identification");
 
-    dump_dir_t *dd = dd_init();
+    struct dump_dir *dd = dd_init();
     if (!dd_opendir(dd, pDebugDumpDir))
     {
         dd_close(dd);
diff --git a/lib/plugins/KerneloopsScanner.cpp b/lib/plugins/KerneloopsScanner.cpp
index 9b454022..e0e64438 100644
--- a/lib/plugins/KerneloopsScanner.cpp
+++ b/lib/plugins/KerneloopsScanner.cpp
@@ -132,7 +132,7 @@ int save_oops_to_debug_dump(const vector_string_t& oopsList)
         char *second_line = (char*)strchr(first_line, '\n'); /* never NULL */
         *second_line++ = '\0';
 
-        dump_dir_t *dd = dd_init();
+        struct dump_dir *dd = dd_init();
         if (dd_create(dd, path, /*uid:*/ 0))
         {
             dd_save_text(dd, FILENAME_ANALYZER, "Kerneloops");
diff --git a/lib/plugins/Python.cpp b/lib/plugins/Python.cpp
index 257fe806..9ef830e3 100644
--- a/lib/plugins/Python.cpp
+++ b/lib/plugins/Python.cpp
@@ -25,7 +25,7 @@ using namespace std;
 
 string CAnalyzerPython::GetLocalUUID(const char *pDebugDumpDir)
 {
-    dump_dir_t *dd = dd_init();
+    struct dump_dir *dd = dd_init();
     if (!dd_opendir(dd, pDebugDumpDir))
     {
         dd_close(dd);
diff --git a/lib/plugins/RunApp.cpp b/lib/plugins/RunApp.cpp
index 085a1332..0bf5ff0c 100644
--- a/lib/plugins/RunApp.cpp
+++ b/lib/plugins/RunApp.cpp
@@ -57,7 +57,7 @@ void CActionRunApp::Run(const char *pActionDir, const char *pArgs, int force)
 
     if (args.size() > FILENAME)
     {
-        dump_dir_t *dd = dd_init();
+        struct dump_dir *dd = dd_init();
         if (!dd_opendir(dd, pActionDir))
         {
             dd_close(dd);
diff --git a/lib/plugins/SOSreport.cpp b/lib/plugins/SOSreport.cpp
index 237fa104..280738d2 100644
--- a/lib/plugins/SOSreport.cpp
+++ b/lib/plugins/SOSreport.cpp
@@ -50,7 +50,7 @@ void CActionSOSreport::Run(const char *pActionDir, const char *pArgs, int force)
 {
     if (!force)
     {
-        dump_dir_t *dd = dd_init();
+        struct dump_dir *dd = dd_init();
         if (!dd_opendir(dd, pActionDir))
         {
             dd_close(dd);
diff --git a/lib/utils/dump_dir.c b/lib/utils/dump_dir.c
index b0dc7ba9..2602eded 100644
--- a/lib/utils/dump_dir.c
+++ b/lib/utils/dump_dir.c
@@ -75,15 +75,15 @@ static bool exist_file_dir(const char *path)
 }
 
 static char *load_text_file(const char *path);
-static void dd_lock(dump_dir_t *dd);
-static void dd_unlock(dump_dir_t *dd);
+static void dd_lock(struct dump_dir *dd);
+static void dd_unlock(struct dump_dir *dd);
 
-dump_dir_t* dd_init(void)
+struct dump_dir *dd_init(void)
 {
-    return (dump_dir_t*)xzalloc(sizeof(dump_dir_t));
+    return (struct dump_dir*)xzalloc(sizeof(struct dump_dir));
 }
 
-void dd_close(dump_dir_t *dd)
+void dd_close(struct dump_dir *dd)
 {
     if (!dd)
         return;
@@ -99,7 +99,7 @@ void dd_close(dump_dir_t *dd)
     free(dd);
 }
 
-int dd_opendir(dump_dir_t *dd, const char *dir)
+int dd_opendir(struct dump_dir *dd, const char *dir)
 {
     if (dd->locked)
         error_msg_and_die("dump_dir is already opened"); /* bug */
@@ -125,7 +125,7 @@ int dd_opendir(dump_dir_t *dd, const char *dir)
     return 1;
 }
 
-int dd_exist(dump_dir_t *dd, const char *path)
+int dd_exist(struct dump_dir *dd, const char *path)
 {
     char *full_path = concat_path_file(dd->dd_dir, path);
     int ret = exist_file_dir(full_path);
@@ -181,7 +181,7 @@ static bool get_and_set_lock(const char* lock_file, const char* pid)
     return true;
 }
 
-static void dd_lock(dump_dir_t *dd)
+static void dd_lock(struct dump_dir *dd)
 {
     if (dd->locked)
         error_msg_and_die("Locking bug on '%s'", dd->dd_dir);
@@ -197,7 +197,7 @@ static void dd_lock(dump_dir_t *dd)
     }
 }
 
-static void dd_unlock(dump_dir_t *dd)
+static void dd_unlock(struct dump_dir *dd)
 {
     if (dd->locked)
     {
@@ -228,7 +228,7 @@ static void dd_unlock(dump_dir_t *dd)
  * Currently, we set dir's gid to passwd(uid)->pw_gid parameter, and we set uid to
  * abrt's user id. We do not allow write access to group.
  */
-int dd_create(dump_dir_t *dd, const char *dir, uid_t uid)
+int dd_create(struct dump_dir *dd, const char *dir, uid_t uid)
 {
     if (dd->locked)
         error_msg_and_die("dump_dir is already opened"); /* bug */
@@ -351,7 +351,7 @@ static bool delete_file_dir(const char *dir)
     return true;
 }
 
-void dd_delete(dump_dir_t *dd)
+void dd_delete(struct dump_dir *dd)
 {
     if (!exist_file_dir(dd->dd_dir))
     {
@@ -409,7 +409,7 @@ static bool save_binary_file(const char *path, const char* data, unsigned size,
     return true;
 }
 
-char* dd_load_text(const dump_dir_t *dd, const char *name)
+char* dd_load_text(const struct dump_dir *dd, const char *name)
 {
     if (!dd->locked)
         error_msg_and_die("dump_dir is not opened"); /* bug */
@@ -421,7 +421,7 @@ char* dd_load_text(const dump_dir_t *dd, const char *name)
     return ret;
 }
 
-void dd_save_text(dump_dir_t *dd, const char *name, const char *data)
+void dd_save_text(struct dump_dir *dd, const char *name, const char *data)
 {
     if (!dd->locked)
         error_msg_and_die("dump_dir is not opened"); /* bug */
@@ -431,7 +431,7 @@ void dd_save_text(dump_dir_t *dd, const char *name, const char *data)
     free(full_path);
 }
 
-void dd_save_binary(dump_dir_t* dd, const char* name, const char* data, unsigned size)
+void dd_save_binary(struct dump_dir* dd, const char* name, const char* data, unsigned size)
 {
     if (!dd->locked)
         error_msg_and_die("dump_dir is not opened"); /* bug */
@@ -441,7 +441,7 @@ void dd_save_binary(dump_dir_t* dd, const char* name, const char* data, unsigned
     free(full_path);
 }
 
-DIR *dd_init_next_file(dump_dir_t *dd)
+DIR *dd_init_next_file(struct dump_dir *dd)
 {
     if (!dd->locked)
         error_msg_and_die("dump_dir is not opened"); /* bug */
@@ -458,7 +458,7 @@ DIR *dd_init_next_file(dump_dir_t *dd)
     return dd->next_dir;
 }
 
-int dd_get_next_file(dump_dir_t *dd, char **short_name, char **full_name)
+int dd_get_next_file(struct dump_dir *dd, char **short_name, char **full_name)
 {
     if (dd->next_dir == NULL)
         return 0;
@@ -484,7 +484,7 @@ int dd_get_next_file(dump_dir_t *dd, char **short_name, char **full_name)
 /* Utility function */
 void delete_debug_dump_dir(const char *dd_dir)
 {
-    dump_dir_t *dd = dd_init();
+    struct dump_dir *dd = dd_init();
     if (dd_opendir(dd, dd_dir))
         dd_delete(dd);
     else
diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp
index 87392113..ee353691 100644
--- a/src/daemon/MiddleWare.cpp
+++ b/src/daemon/MiddleWare.cpp
@@ -129,7 +129,7 @@ static char* is_text_file(const char *name, ssize_t *sz)
     return NULL; /* it's binary */
 }
 
-static void load_crash_data_from_debug_dump(dump_dir_t *dd, map_crash_data_t& data)
+static void load_crash_data_from_debug_dump(struct dump_dir *dd, map_crash_data_t& data)
 {
     char *short_name;
     char *full_name;
@@ -188,7 +188,7 @@ static bool DebugDumpToCrashReport(const char *pDebugDumpDir, map_crash_data_t&
 {
     VERB3 log(" DebugDumpToCrashReport('%s')", pDebugDumpDir);
 
-    dump_dir_t *dd = dd_init();
+    struct dump_dir *dd = dd_init();
     if (dd_opendir(dd, pDebugDumpDir))
     {
         const char *const *v = must_have_files;
@@ -304,7 +304,7 @@ mw_result_t CreateCrashReport(const char *crash_id,
     mw_result_t r = MW_OK;
     try
     {
-        dump_dir_t *dd = dd_init();
+        struct dump_dir *dd = dd_init();
         if (!dd_opendir(dd, row->db_dump_dir))
         {
             dd_close(dd);
@@ -461,7 +461,7 @@ 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)
     {
-        dump_dir_t *dd = dd_init();
+        struct dump_dir *dd = dd_init();
         if (dd_opendir(dd, pDumpDir.c_str()))
         {
             if (comment)
@@ -737,7 +737,7 @@ static mw_result_t SavePackageDescriptionToDebugDump(
             {
                 VERB2 log("Crash in unpackaged executable '%s', proceeding without packaging information", pExecutable);
 
-                dump_dir_t *dd = dd_init();
+                struct dump_dir *dd = dd_init();
                 if (!dd_opendir(dd, pDebugDumpDir))
                 {
                     dd_close(dd);
@@ -862,7 +862,7 @@ static mw_result_t SavePackageDescriptionToDebugDump(
         }
     }
 
-    dump_dir_t *dd = dd_init();
+    struct dump_dir *dd = dd_init();
     if (dd_opendir(dd, pDebugDumpDir))
     {
         if (rpm_pkg)
@@ -1053,7 +1053,7 @@ mw_result_t SaveDebugDump(const char *pDebugDumpDir,
     mw_result_t res;
     int remote = 0;
 
-    dump_dir_t *dd = dd_init();
+    struct dump_dir *dd = dd_init();
     if (!dd_opendir(dd, pDebugDumpDir))
     {
         dd_close(dd);
@@ -1142,7 +1142,7 @@ mw_result_t FillCrashInfo(const char *crash_id,
     if (!row)
         return MW_ERROR;
 
-    dump_dir_t *dd = dd_init();
+    struct dump_dir *dd = dd_init();
     if (!dd_opendir(dd, row->db_dump_dir))
     {
         dd_close(dd);
diff --git a/src/daemon/abrt-server.c b/src/daemon/abrt-server.c
index 44955351..bb2c024d 100644
--- a/src/daemon/abrt-server.c
+++ b/src/daemon/abrt-server.c
@@ -115,7 +115,7 @@ static void create_debug_dump()
     /* No need to check the path length, as all variables used are limited, and dd_create()
        fails if the path is too long. */
 
-    dump_dir_t *dd = dd_init();
+    struct dump_dir *dd = dd_init();
     if (!dd_create(dd, path, client_uid))
     {
         dd_delete(dd);
diff --git a/src/hooks/abrt-hook-ccpp.cpp b/src/hooks/abrt-hook-ccpp.cpp
index 6faa6a6c..a35bba11 100644
--- a/src/hooks/abrt-hook-ccpp.cpp
+++ b/src/hooks/abrt-hook-ccpp.cpp
@@ -414,7 +414,7 @@ int main(int argc, char** argv)
         if (path_len >= (sizeof(path) - sizeof("/"FILENAME_COREDUMP)))
             return 1;
 
-        dump_dir_t *dd = dd_init();
+        struct dump_dir *dd = dd_init();
         if (dd_create(dd, path, uid))
         {
             char *cmdline = get_cmdline(pid); /* never NULL */