Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'sre/tint2-fix-battery-memleak'

Browse Source
This commit is contained in:
o9000
2015-09-12 11:14:11 +02:00
parent 5b01670a22 3d39da9330
commit dca5c2586c
2 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/battery/battery.c
View File

@@ -168,6 +168,10 @@ void cleanup_battery()
battery_uwheel_command = NULL; battery_uwheel_command = NULL;
free(battery_dwheel_command); free(battery_dwheel_command);
battery_dwheel_command = NULL; battery_dwheel_command = NULL;
free(ac_connected_cmd);
ac_connected_cmd = NULL;
free(ac_disconnected_cmd);
ac_disconnected_cmd = NULL;
stop_timeout(battery_timeout); stop_timeout(battery_timeout);
battery_timeout = NULL; battery_timeout = NULL;
battery_found = 0; battery_found = 0;

49
src/battery/linux.c
View File

@@ -193,40 +193,31 @@ static gboolean init_linux_mains(struct psy_mains *ac) {
return TRUE; return TRUE;
} }
void battery_os_free() { static void psy_battery_free(gpointer data) {
GList *l = batteries; struct psy_battery *bat = data;
g_free(bat->name);
g_free(bat->path_status);
g_free(bat->path_power_now);
g_free(bat->path_energy_full);
g_free(bat->path_energy_now);
g_free(bat->path_present);
g_free(bat);
}
static void psy_mains_free(gpointer data) {
struct psy_mains *ac = data;
g_free(ac->name);
g_free(ac->path_online);
g_free(ac);
}
void battery_os_free() {
uevent_unregister_notifier(&psy_change); uevent_unregister_notifier(&psy_change);
uevent_unregister_notifier(&psy_plug); uevent_unregister_notifier(&psy_plug);
while (l != NULL) { g_list_free_full(batteries, psy_battery_free);
GList *next = l->next;
struct psy_battery *bat = l->data;
g_free(bat->name);
g_free(bat->path_status);
g_free(bat->path_power_now);
g_free(bat->path_energy_full);
g_free(bat->path_energy_now);
g_free(bat->path_present);
batteries = g_list_delete_link(batteries, l);
l = next;
}
l = mains;
while (l != NULL) {
GList *next = l->next;
struct psy_mains *ac = l->data;
g_free(ac->name);
g_free(ac->path_online);
mains = g_list_delete_link(mains, l);
l = next;
}
batteries = NULL; batteries = NULL;
g_list_free_full(mains, psy_mains_free);
mains = NULL; mains = NULL;
} }