introduce and use new helper function list_free_with_free

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

5 files changed, 15 insertions, 25 deletions

diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp
index eddcd766..8d972a9a 100644
--- a/src/daemon/Daemon.cpp
+++ b/src/daemon/Daemon.cpp
@@ -25,7 +25,6 @@
 #include <string>
 #include <sys/inotify.h>
 #include <sys/ioctl.h> /* ioctl(FIONREAD) */
-#include <glib.h>
 #include "abrtlib.h"
 #include "comm_layer_inner.h"
 #include "Settings.h"
@@ -633,7 +632,7 @@ int main(int argc, char** argv)
         init_daemon_logging(&watcher);
 
         VERB1 log("Loading settings");
-        if (LoadSettings() != 0)
+        if (load_settings() != 0)
             throw 1;
 
         sanitize_dump_dir_rights();
@@ -759,7 +758,7 @@ int main(int argc, char** argv)
     if (pMainloop)
         g_main_loop_unref(pMainloop);
 
-    settings_free();
+    free_settings();
 
     if (log_scanner_pid > 0)
     {
diff --git a/src/daemon/Settings.cpp b/src/daemon/Settings.cpp
index b8f8751e..ff9062fc 100644
--- a/src/daemon/Settings.cpp
+++ b/src/daemon/Settings.cpp
@@ -31,7 +31,7 @@
  */
 
 /* Static data */
-/* Filled by LoadSettings() */
+/* Filled by load_settings() */
 
 /* map["name"] = "value" strings from [ Common ] section.
  * If the same name found on more than one line,
@@ -258,7 +258,7 @@ static int ReadConfigurationFromFile(FILE *fp)
 }
 
 /* abrt daemon loads .conf file */
-int LoadSettings()
+int load_settings()
 {
     int err = 0;
 
@@ -311,26 +311,20 @@ map_abrt_settings_t GetSettings()
 //    }
 //}
 
-void settings_free()
+void free_settings()
 {
-    for (GList *li = g_settings_setOpenGPGPublicKeys; li != NULL; li = g_list_next(li))
-        free((char*)li->data);
-
-    g_list_free(g_settings_setOpenGPGPublicKeys);
+    list_free_with_free(g_settings_setOpenGPGPublicKeys);
     g_settings_setOpenGPGPublicKeys = NULL;
 
-    for (GList *li = g_settings_setBlackListedPkgs; li != NULL; li = g_list_next(li))
-        free((char*)li->data);
-
-    g_list_free(g_settings_setBlackListedPkgs);
+    list_free_with_free(g_settings_setBlackListedPkgs);
     g_settings_setBlackListedPkgs = NULL;
 
-    for (GList *li = g_settings_setBlackListedPaths; li != NULL; li = g_list_next(li))
-        free((char*)li->data);
-
-    g_list_free(g_settings_setBlackListedPaths);
+    list_free_with_free(g_settings_setBlackListedPaths);
     g_settings_setBlackListedPaths = NULL;
 
     free(g_settings_sWatchCrashdumpArchiveDir);
     g_settings_sWatchCrashdumpArchiveDir = NULL;
+
+    free(g_settings_sLogScanners);
+    g_settings_sLogScanners = NULL;
 }
diff --git a/src/daemon/Settings.h b/src/daemon/Settings.h
index 6940732f..dce6407d 100644
--- a/src/daemon/Settings.h
+++ b/src/daemon/Settings.h
@@ -20,7 +20,6 @@
 #define SETTINGS_H_
 
 #include "abrt_types.h"
-#include <glib.h>
 
 #ifdef __cplusplus
 
@@ -43,9 +42,8 @@ extern char *        g_settings_sWatchCrashdumpArchiveDir;
 
 extern char *        g_settings_sLogScanners;
 
-int LoadSettings();
-
-void settings_free();
+int load_settings();
+void free_settings();
 
 #ifdef __cplusplus
 }
diff --git a/src/daemon/abrt-action-save-package-data.c b/src/daemon/abrt-action-save-package-data.c
index cb880bd3..d912dec4 100644
--- a/src/daemon/abrt-action-save-package-data.c
+++ b/src/daemon/abrt-action-save-package-data.c
@@ -304,8 +304,8 @@ int main(int argc, char **argv)
     }
 
     VERB1 log("Loading settings");
-    if (LoadSettings() != 0)
-        return 1; /* syntax error (looged already by LoadSettings) */
+    if (load_settings() != 0)
+        return 1; /* syntax error (logged already by load_settings) */
 
     VERB1 log("Initializing rpm library");
     rpm_init();
diff --git a/src/daemon/rpm.c b/src/daemon/rpm.c
index 4665273f..25f95e8c 100644
--- a/src/daemon/rpm.c
+++ b/src/daemon/rpm.c
@@ -16,7 +16,6 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#include <glib.h>
 #include "abrtlib.h"
 #include "rpm.h"