remove return value from MEM_freeN, it wasn't used anywhere and was cast to a different function signature. (which evidently works but error prone).

8 files changed, 14 insertions, 14 deletions

diff --git a/source/blender/blenkernel/intern/addon.c b/source/blender/blenkernel/intern/addon.c
index 7f475cd4732..ae6ec7cd7e1 100644
--- a/source/blender/blenkernel/intern/addon.c
+++ b/source/blender/blenkernel/intern/addon.c
@@ -69,7 +69,7 @@ void BKE_addon_pref_type_add(bAddonPrefType *apt)
 
 void BKE_addon_pref_type_remove(bAddonPrefType *apt)
 {
-	BLI_ghash_remove(global_addonpreftype_hash, (void *)apt->idname, NULL, (GHashValFreeFP)MEM_freeN);
+	BLI_ghash_remove(global_addonpreftype_hash, (void *)apt->idname, NULL, MEM_freeN);
 }
 
 void BKE_addon_pref_type_init(void)
@@ -80,6 +80,6 @@ void BKE_addon_pref_type_init(void)
 
 void BKE_addon_pref_type_free(void)
 {
-	BLI_ghash_free(global_addonpreftype_hash, NULL, (GHashValFreeFP)MEM_freeN);
+	BLI_ghash_free(global_addonpreftype_hash, NULL, MEM_freeN);
 	global_addonpreftype_hash = NULL;
 }
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 35f99806df0..3b9fbbb1c4d 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -127,7 +127,7 @@ void BKE_curve_editNurb_keyIndex_free(EditNurb *editnurb)
 	if (!editnurb->keyindex) {
 		return;
 	}
-	BLI_ghash_free(editnurb->keyindex, NULL, (GHashValFreeFP)MEM_freeN);
+	BLI_ghash_free(editnurb->keyindex, NULL, MEM_freeN);
 	editnurb->keyindex = NULL;
 }
 
diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c
index d05f150e47c..c6a5552dbf7 100644
--- a/source/blender/blenkernel/intern/pbvh_bmesh.c
+++ b/source/blender/blenkernel/intern/pbvh_bmesh.c
@@ -255,7 +255,7 @@ static int pbvh_bmesh_node_limit_ensure(PBVH *bvh, int node_index)
 
 	pbvh_bmesh_node_split(bvh, prim_bbc, node_index);
 
-	BLI_ghash_free(prim_bbc, NULL, (void *)MEM_freeN);
+	BLI_ghash_free(prim_bbc, NULL, MEM_freeN);
 
 	return TRUE;
 }
diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c
index 1dc6f44c95a..f5758711ad2 100644
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -733,7 +733,7 @@ static void ui_editsource_active_but_set(uiBut *but)
 
 static void ui_editsource_active_but_clear(void)
 {
-	BLI_ghash_free(ui_editsource_info->hash, NULL, (GHashValFreeFP)MEM_freeN);
+	BLI_ghash_free(ui_editsource_info->hash, NULL, MEM_freeN);
 	MEM_freeN(ui_editsource_info);
 	ui_editsource_info = NULL;
 }
diff --git a/source/blender/editors/space_text/text_autocomplete.c b/source/blender/editors/space_text/text_autocomplete.c
index b3ac04fac21..b1e4aaad7f7 100644
--- a/source/blender/editors/space_text/text_autocomplete.c
+++ b/source/blender/editors/space_text/text_autocomplete.c
@@ -521,7 +521,7 @@ static void text_autocomplete_free(bContext *C, wmOperator *op)
 {
 	GHash *gh = op->customdata;
 	if (gh) {
-		BLI_ghash_free(gh, NULL, (GHashValFreeFP)MEM_freeN);
+		BLI_ghash_free(gh, NULL, MEM_freeN);
 		op->customdata = NULL;
 	}
 
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 2be3c118ec8..c51fb244eb6 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -895,7 +895,7 @@ static void set_object_orco(Render *re, void *ob, float *orco)
 static void free_mesh_orco_hash(Render *re) 
 {
 	if (re->orco_hash) {
-		BLI_ghash_free(re->orco_hash, NULL, (GHashValFreeFP)MEM_freeN);
+		BLI_ghash_free(re->orco_hash, NULL, MEM_freeN);
 		re->orco_hash = NULL;
 	}
 }
diff --git a/source/blender/render/intern/source/strand.c b/source/blender/render/intern/source/strand.c
index 8b83ca4b6c3..9bfdf73f367 100644
--- a/source/blender/render/intern/source/strand.c
+++ b/source/blender/render/intern/source/strand.c
@@ -338,7 +338,7 @@ StrandShadeCache *strand_shade_cache_create(void)
 void strand_shade_cache_free(StrandShadeCache *cache)
 {
 	BLI_ghash_free(cache->refcounthash, NULL, NULL);
-	BLI_ghash_free(cache->resulthash, (GHashKeyFreeFP)MEM_freeN, NULL);
+	BLI_ghash_free(cache->resulthash, MEM_freeN, NULL);
 	BLI_memarena_free(cache->memarena);
 	MEM_freeN(cache);
 }
@@ -377,7 +377,7 @@ static void strand_shade_get(Render *re, StrandShadeCache *cache, ShadeSample *s
 	/* lower reference count and remove if not needed anymore by any samples */
 	(*refcount)--;
 	if (*refcount == 0) {
-		BLI_ghash_remove(cache->resulthash, &pair, (GHashKeyFreeFP)MEM_freeN, NULL);
+		BLI_ghash_remove(cache->resulthash, &pair, MEM_freeN, NULL);
 		BLI_ghash_remove(cache->refcounthash, &pair, NULL, NULL);
 	}
 }
@@ -412,7 +412,7 @@ void strand_shade_unref(StrandShadeCache *cache, ObjectInstanceRen *obi, StrandV
 
 	(*refcount)--;
 	if (*refcount == 0) {
-		BLI_ghash_remove(cache->resulthash, &pair, (GHashKeyFreeFP)MEM_freeN, NULL);
+		BLI_ghash_remove(cache->resulthash, &pair, MEM_freeN, NULL);
 		BLI_ghash_remove(cache->refcounthash, &pair, NULL, NULL);
 	}
 }
diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c
index 8163e9544aa..765f8fbfc31 100644
--- a/source/blender/windowmanager/intern/wm.c
+++ b/source/blender/windowmanager/intern/wm.c
@@ -221,7 +221,7 @@ int WM_uilisttype_add(uiListType *ult)
 
 void WM_uilisttype_freelink(uiListType *ult)
 {
-	BLI_ghash_remove(uilisttypes_hash, ult->idname, NULL, (GHashValFreeFP)MEM_freeN);
+	BLI_ghash_remove(uilisttypes_hash, ult->idname, NULL, MEM_freeN);
 }
 
 /* called on initialize WM_init() */
@@ -242,7 +242,7 @@ void WM_uilisttype_free(void)
 	}
 	BLI_ghashIterator_free(iter);
 
-	BLI_ghash_free(uilisttypes_hash, NULL, (GHashValFreeFP)MEM_freeN);
+	BLI_ghash_free(uilisttypes_hash, NULL, MEM_freeN);
 	uilisttypes_hash = NULL;
 }
 
@@ -274,7 +274,7 @@ int WM_menutype_add(MenuType *mt)
 
 void WM_menutype_freelink(MenuType *mt)
 {
-	BLI_ghash_remove(menutypes_hash, mt->idname, NULL, (GHashValFreeFP)MEM_freeN);
+	BLI_ghash_remove(menutypes_hash, mt->idname, NULL, MEM_freeN);
 }
 
 /* called on initialize WM_init() */
@@ -295,7 +295,7 @@ void WM_menutype_free(void)
 	}
 	BLI_ghashIterator_free(iter);
 
-	BLI_ghash_free(menutypes_hash, NULL, (GHashValFreeFP)MEM_freeN);
+	BLI_ghash_free(menutypes_hash, NULL, MEM_freeN);
 	menutypes_hash = NULL;
 }