aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorLeandro Pereira <leandro@hardinfo.org>2012-01-15 19:04:16 -0200
committerLeandro Pereira <leandro@hardinfo.org>2012-01-15 19:10:36 -0200
commit0df66e809f9149842ad2e6752a040a23c22c7ebb (patch)
tree3feb723c43f18484893e6961d0b5110d3ea8c4a9 /modules
parent03eb46be1b95bf1eaeb33aa169b9689a0b3004ac (diff)
Remove more sightings of if (ptr) { free(ptr) }
Diffstat (limited to 'modules')
-rw-r--r--modules/computer/modules.c4
-rw-r--r--modules/devices/battery.c4
-rw-r--r--modules/network/net.c8
-rw-r--r--modules/network/nfs.c4
4 files changed, 5 insertions, 15 deletions
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("");