Merge branch 'ab/free-and-null'
A common pattern to free a piece of memory and assign NULL to the pointer that used to point at it has been replaced with a new FREE_AND_NULL() macro. * ab/free-and-null: *.[ch] refactoring: make use of the FREE_AND_NULL() macro coccinelle: make use of the "expression" FREE_AND_NULL() rule coccinelle: add a rule to make "expression" code use FREE_AND_NULL() coccinelle: make use of the "type" FREE_AND_NULL() rule coccinelle: add a rule to make "type" code use FREE_AND_NULL() git-compat-util: add a FREE_AND_NULL() wrapper around free(ptr); ptr = NULL
This commit is contained in:
@ -838,8 +838,7 @@ static void interactive_main_loop(void)
|
||||
int ret;
|
||||
ret = menus[*chosen].fn();
|
||||
if (ret != MENU_RETURN_NO_LOOP) {
|
||||
free(chosen);
|
||||
chosen = NULL;
|
||||
FREE_AND_NULL(chosen);
|
||||
if (!del_list.nr) {
|
||||
clean_print_color(CLEAN_COLOR_ERROR);
|
||||
printf_ln(_("No more files to clean, exiting."));
|
||||
@ -852,8 +851,7 @@ static void interactive_main_loop(void)
|
||||
quit_cmd();
|
||||
}
|
||||
|
||||
free(chosen);
|
||||
chosen = NULL;
|
||||
FREE_AND_NULL(chosen);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user