DrathOrg/libratbag-plus
1
0
Fork 0
forked from drath/libratbag
Code Pull Requests Activity

Remove unnecessary NULL check before free()

Browse Source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2017-08-31 10:30:49 +10:00
parent 1103c208a8
commit 8cb2d21ff5
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/hidpp10.c
View File

@@ -1142,8 +1142,7 @@ hidpp10_onboard_profiles_read_macro(struct hidpp10_device *device,
return index;
out_err:
if (macro)
free(macro);
free(macro);
return rc;
}
@@ -2723,8 +2722,7 @@ hidpp10_device_destroy(struct hidpp10_device *dev)
union hidpp10_macro_data **macro;
unsigned i;
if (dev->dpi_table)
free(dev->dpi_table);
free(dev->dpi_table);
for (i = 0; i < dev->profile_count; i++) {
ARRAY_FOR_EACH(dev->profiles[i].macros, macro) {
if (*macro) {

6
src/hidpp20.c
View File

@@ -1596,8 +1596,7 @@ hidpp20_onboard_profiles_read_macro(struct hidpp20_device *device,
return index;
out_err:
if (macro)
free(macro);
free(macro);
return rc;
}
@@ -1719,8 +1718,7 @@ hidpp20_onboard_profiles_destroy(struct hidpp20_profiles *profiles_list)
profile = &profiles_list->profiles[i];
ARRAY_FOR_EACH(profile->macros, macro) {
if (*macro)
free(*macro);
free(*macro);
}
}

9
src/libratbag.c
View File

@@ -744,8 +744,7 @@ ratbag_profile_destroy(struct ratbag_profile *profile)
free(profile->resolution.modes);
if (profile->name)
free(profile->name);
free(profile->name);
list_remove(&profile->link);
free(profile);
@@ -1388,8 +1387,7 @@ ratbag_button_destroy(struct ratbag_button *button)
{
list_remove(&button->link);
if (button->action.macro) {
if (button->action.macro->name)
free(button->action.macro->name);
free(button->action.macro->name);
free(button->action.macro);
}
free(button);
@@ -1644,8 +1642,7 @@ ratbag_button_copy_macro(struct ratbag_button *button,
if (!button->action.macro)
button->action.macro = zalloc(sizeof(struct ratbag_macro));
else {
if (button->action.macro->name)
free(button->action.macro->name);
free(button->action.macro->name);
memset(button->action.macro, 0, sizeof(struct ratbag_macro));
}