ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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).

Browse source
This commit is contained in:
Campbell Barton 2013-05-21 07:37:59 +00:00
parent 1031676800
commit cd6b27f2b5
10 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
intern/guardedalloc/MEM_guardedalloc.h
View file

@ -82,7 +82,7 @@ extern "C" {
/**
* Release memory previously allocatred by this module.
*/
short MEM_freeN(void *vmemh);
void MEM_freeN(void *vmemh);
#if 0 /* UNUSED */
/**

5
intern/guardedalloc/intern/mallocn.c
View file

@ -743,7 +743,7 @@ void MEM_printmemlist_pydict(void)
MEM_printmemlist_internal(1);
}
short MEM_freeN(void *vmemh)
void MEM_freeN(void *vmemh)
{
short error = 0;
MemTail *memt;
@ -1065,10 +1065,9 @@ size_t MEM_allocN_len(const void *vmemh)
return malloc_usable_size((void *)vmemh);
}
short MEM_freeN(void *vmemh)
void MEM_freeN(void *vmemh)
{
free(vmemh);
return 1;
}
void *MEM_dupallocN(const void *vmemh)

4
source/blender/blenkernel/intern/addon.c
View file

@ -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;
}

2
source/blender/blenkernel/intern/curve.c
View file

@ -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;
}

2
source/blender/blenkernel/intern/pbvh_bmesh.c
View file

@ -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;
}

2
source/blender/editors/interface/interface_ops.c
View file

@ -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;
}

2
source/blender/editors/space_text/text_autocomplete.c
View file

@ -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;
}

2
source/blender/render/intern/source/convertblender.c
View file

@ -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;
}
}

6
source/blender/render/intern/source/strand.c
View file

@ -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);
}
}

8
source/blender/windowmanager/intern/wm.c
View file

@ -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;
}