GHash: no need to malloc iterators

1 files changed, 6 insertions, 8 deletions

diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c
index a6a3c6b0a28..34069e0b873 100644
--- a/source/blender/windowmanager/intern/wm.c
+++ b/source/blender/windowmanager/intern/wm.c
@@ -250,15 +250,14 @@ void WM_uilisttype_init(void)
 
 void WM_uilisttype_free(void)
 {
-	GHashIterator *iter = BLI_ghashIterator_new(uilisttypes_hash);
+	GHashIterator gh_iter;
 
-	for (; !BLI_ghashIterator_done(iter); BLI_ghashIterator_step(iter)) {
-		uiListType *ult = BLI_ghashIterator_getValue(iter);
+	GHASH_ITER (gh_iter, uilisttypes_hash) {
+		uiListType *ult = BLI_ghashIterator_getValue(&gh_iter);
 		if (ult->ext.free) {
 			ult->ext.free(ult->ext.data);
 		}
 	}
-	BLI_ghashIterator_free(iter);
 
 	BLI_ghash_free(uilisttypes_hash, NULL, MEM_freeN);
 	uilisttypes_hash = NULL;
@@ -309,15 +308,14 @@ void WM_menutype_init(void)
 
 void WM_menutype_free(void)
 {
-	GHashIterator *iter = BLI_ghashIterator_new(menutypes_hash);
+	GHashIterator gh_iter;
 
-	for (; !BLI_ghashIterator_done(iter); BLI_ghashIterator_step(iter)) {
-		MenuType *mt = BLI_ghashIterator_getValue(iter);
+	GHASH_ITER (gh_iter, menutypes_hash) {
+		MenuType *mt = BLI_ghashIterator_getValue(&gh_iter);
 		if (mt->ext.free) {
 			mt->ext.free(mt->ext.data);
 		}
 	}
-	BLI_ghashIterator_free(iter);
 
 	BLI_ghash_free(menutypes_hash, NULL, MEM_freeN);
 	menutypes_hash = NULL;