5 files changed, 6 insertions, 18 deletions
diff --git a/hardinfo/util.c b/hardinfo/util.c
index fb995406..0f88c388 100644
--- a/hardinfo/util.c
+++ b/hardinfo/util.c
@@ -1065,9 +1065,7 @@ void tree_view_save_image(gchar * filename)
 
 static gboolean __idle_free_do(gpointer ptr)
 {
-    if (ptr) {
-	g_free(ptr);
-    }
+    g_free(ptr);
 
     return FALSE;
 }
diff --git a/modules/computer/modules.c b/modules/computer/modules.c
index 195c444b..743ba176 100644
--- a/modules/computer/modules.c
+++ b/modules/computer/modules.c
@@ -47,9 +47,7 @@ scan_modules_do(void)
         _module_hash_table = g_hash_table_new(g_str_hash, g_str_equal);
     }
 
-    if (module_list) {
-        g_free(module_list);
-    }
+    g_free(module_list);
     
     module_list = NULL;
     g_hash_table_foreach_remove(moreinfo, remove_module_devices, NULL);
diff --git a/modules/devices/battery.c b/modules/devices/battery.c
index 53fca740..d6d95255 100644
--- a/modules/devices/battery.c
+++ b/modules/devices/battery.c
@@ -291,9 +291,7 @@ __scan_battery_apm(void)
 void
 scan_battery_do(void)
 {
-    if (battery_list) {
-      g_free(battery_list);
-    }
+    g_free(battery_list);
     battery_list = g_strdup("");
 
     __scan_battery_acpi();
diff --git a/modules/network/net.c b/modules/network/net.c
index 97802cce..f8451239 100644
--- a/modules/network/net.c
+++ b/modules/network/net.c
@@ -312,13 +312,9 @@ static void scan_net_interfaces_24(void)
 	return;
     }
 
-    if (network_interfaces) {
-	g_free(network_interfaces);
-    }
+    g_free(network_interfaces);
 
-    if (network_icons) {
-	g_free(network_icons);
-    }
+    g_free(network_icons);
 
     network_interfaces = g_strdup("[Network Interfaces]\n");
     network_icons = g_strdup("");
diff --git a/modules/network/nfs.c b/modules/network/nfs.c
index b51993a0..54bbfe0e 100644
--- a/modules/network/nfs.c
+++ b/modules/network/nfs.c
@@ -30,9 +30,7 @@ scan_nfs_shared_directories(void)
     gint count = 0;
     gchar buf[512];
     
-    if (nfs_shares_list) {
-        g_free(nfs_shares_list);
-    }
+    g_free(nfs_shares_list);
 
     nfs_shares_list = g_strdup("");