griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: add "_data" suffix to wm_keymap_item_free

Browse Source 
Clarify that the wmKeyMapItem it's self isn't freed.
This commit is contained in:
Campbell Barton
2023-10-13 14:20:29 +11:00
parent 845f7f6d44
commit 604c0d8d5c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/windowmanager/intern/wm_keymap.cc
View File

@@ -83,7 +83,7 @@ static wmKeyMapItem *wm_keymap_item_copy(wmKeyMapItem *kmi)
return kmin;
}
static void wm_keymap_item_free(wmKeyMapItem *kmi)
static void wm_keymap_item_free_data(wmKeyMapItem *kmi)
{
/* not kmi itself */
if (kmi->ptr) {
@@ -138,7 +138,7 @@ static void wm_keymap_item_properties_update_ot(wmKeyMapItem *kmi)
}
else {
/* zombie keymap item */
wm_keymap_item_free(kmi);
wm_keymap_item_free_data(kmi);
}
}
}
@@ -242,11 +242,11 @@ static wmKeyMapDiffItem *wm_keymap_diff_item_copy(wmKeyMapDiffItem *kmdi)
static void wm_keymap_diff_item_free(wmKeyMapDiffItem *kmdi)
{
if (kmdi->remove_item) {
wm_keymap_item_free(kmdi->remove_item);
wm_keymap_item_free_data(kmdi->remove_item);
MEM_freeN(kmdi->remove_item);
}
if (kmdi->add_item) {
wm_keymap_item_free(kmdi->add_item);
wm_keymap_item_free_data(kmdi->add_item);
MEM_freeN(kmdi->add_item);
}
}
@@ -425,7 +425,7 @@ void WM_keymap_clear(wmKeyMap *keymap)
}
LISTBASE_FOREACH_MUTABLE (wmKeyMapItem *, kmi, &keymap->items) {
wm_keymap_item_free(kmi);
wm_keymap_item_free_data(kmi);
MEM_freeN(kmi);
}
@@ -710,7 +710,7 @@ static void wm_keymap_patch(wmKeyMap *km, wmKeyMap *diff_km)
/* remove item */
if (kmi_remove) {
wm_keymap_item_free(kmi_remove);
wm_keymap_item_free_data(kmi_remove);
BLI_freelinkN(&km->items, kmi_remove);
}
}