[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56937] trunk/blender/source/blender: code cleanup: remove callbacks only added to wrap MEM_freeN

[Campbell Barton]

Revision: 56937
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56937
Author:   campbellbarton
Date:     2013-05-21 08:45:10 +0000 (Tue, 21 May 2013)
Log Message:
-----------
code cleanup: remove callbacks only added to wrap MEM_freeN

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/customdata.c
    trunk/blender/source/blender/blenlib/intern/BLI_args.c
    trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
    trunk/blender/source/blender/editors/curve/editcurve.c
    trunk/blender/source/blender/gpu/intern/gpu_codegen.c
    trunk/blender/source/blender/python/intern/bpy_app_translations.c

Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c	2013-05-21 07:37:59 UTC (rev 56936)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c	2013-05-21 08:45:10 UTC (rev 56937)
@@ -215,12 +215,6 @@
 	}
 }
 
-
-static void linklist_free_simple(void *link)
-{
-	MEM_freeN(link);
-}
-
 static void layerInterp_mdeformvert(void **sources, const float *weights,
                                     const float *UNUSED(sub_weights), int count, void *dest)
 {
@@ -281,7 +275,7 @@
 	else
 		memset(dvert, 0, sizeof(*dvert));
 
-	BLI_linklist_free(dest_dw, linklist_free_simple);
+	BLI_linklist_free(dest_dw, MEM_freeN);
 }
 
 static void layerCopy_tface(const void *source, void *dest, int count)

Modified: trunk/blender/source/blender/blenlib/intern/BLI_args.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_args.c	2013-05-21 07:37:59 UTC (rev 56936)
+++ trunk/blender/source/blender/blenlib/intern/BLI_args.c	2013-05-21 08:45:10 UTC (rev 56937)
@@ -129,14 +129,9 @@
 	return ba;
 }
 
-static void freeItem(void *val)
-{
-	MEM_freeN(val);
-}
-
 void BLI_argsFree(struct bArgs *ba)
 {
-	BLI_ghash_free(ba->items, freeItem, freeItem);
+	BLI_ghash_free(ba->items, MEM_freeN, MEM_freeN);
 	MEM_freeN(ba->passes);
 	BLI_freelistN(&ba->docs);
 	MEM_freeN(ba);

Modified: trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_ghash.c	2013-05-21 07:37:59 UTC (rev 56936)
+++ trunk/blender/source/blender/blenlib/intern/BLI_ghash.c	2013-05-21 08:45:10 UTC (rev 56937)
@@ -410,5 +410,5 @@
 
 void BLI_ghashutil_pairfree(void *ptr)
 {
-	MEM_freeN((void *)ptr);
+	MEM_freeN(ptr);
 }

Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c	2013-05-21 07:37:59 UTC (rev 56936)
+++ trunk/blender/source/blender/editors/curve/editcurve.c	2013-05-21 08:45:10 UTC (rev 56937)
@@ -402,7 +402,7 @@
 		return;
 	}
 
-	BLI_ghash_remove(editnurb->keyindex, cv, NULL, (GHashValFreeFP)MEM_freeN);
+	BLI_ghash_remove(editnurb->keyindex, cv, NULL, MEM_freeN);
 }
 
 static void keyIndex_delBezt(EditNurb *editnurb, BezTriple *bezt)
@@ -428,7 +428,7 @@
 		a = nu->pntsu;
 
 		while (a--) {
-			BLI_ghash_remove(editnurb->keyindex, bezt, NULL, (GHashValFreeFP)MEM_freeN);
+			BLI_ghash_remove(editnurb->keyindex, bezt, NULL, MEM_freeN);
 			bezt++;
 		}
 	}
@@ -437,7 +437,7 @@
 		a = nu->pntsu * nu->pntsv;
 
 		while (a--) {
-			BLI_ghash_remove(editnurb->keyindex, bp, NULL, (GHashValFreeFP)MEM_freeN);
+			BLI_ghash_remove(editnurb->keyindex, bp, NULL, MEM_freeN);
 			bp++;
 		}
 	}
@@ -6951,7 +6951,7 @@
 	BKE_nurbList_free(editbase);
 
 	if (undoCurve->undoIndex) {
-		BLI_ghash_free(editnurb->keyindex, NULL, (GHashValFreeFP)MEM_freeN);
+		BLI_ghash_free(editnurb->keyindex, NULL, MEM_freeN);
 		editnurb->keyindex = dupli_keyIndexHash(undoCurve->undoIndex);
 	}
 
@@ -7037,7 +7037,7 @@
 	BKE_nurbList_free(&undoCurve->nubase);
 
 	if (undoCurve->undoIndex)
-		BLI_ghash_free(undoCurve->undoIndex, NULL, (GHashValFreeFP)MEM_freeN);
+		BLI_ghash_free(undoCurve->undoIndex, NULL, MEM_freeN);
 
 	free_fcurves(&undoCurve->fcurves);
 	free_fcurves(&undoCurve->drivers);

Modified: trunk/blender/source/blender/gpu/intern/gpu_codegen.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_codegen.c	2013-05-21 07:37:59 UTC (rev 56936)
+++ trunk/blender/source/blender/gpu/intern/gpu_codegen.c	2013-05-21 08:45:10 UTC (rev 56937)
@@ -255,7 +255,7 @@
 		GPU_material_free(&defmaterial);
 
 	if (FUNCTION_HASH) {
-		BLI_ghash_free(FUNCTION_HASH, NULL, (GHashValFreeFP)MEM_freeN);
+		BLI_ghash_free(FUNCTION_HASH, NULL, MEM_freeN);
 		FUNCTION_HASH = NULL;
 	}
 

Modified: trunk/blender/source/blender/python/intern/bpy_app_translations.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_app_translations.c	2013-05-21 07:37:59 UTC (rev 56936)
+++ trunk/blender/source/blender/python/intern/bpy_app_translations.c	2013-05-21 08:45:10 UTC (rev 56937)
@@ -108,10 +108,7 @@
 	MEM_freeN((void *)key);
 }
 
-static void _ghashutil_valfree(void *ptr)
-{
-	MEM_freeN(ptr);
-}
+#define _ghashutil_valfree MEM_freeN
 
 /***** Python's messages cache *****/