Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-05-21 14:13:42 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-05-21 14:13:42 +0400
commitbc0e3ffc0c3fee50926ef4e100f03bfad5178d62 (patch)
treeef5112f35a9672830760ef2858a3ecc050179e0f /intern
parent13bde6645bd2373c444279aff270a03ea92eef36 (diff)
Fix build error after removing return value from MEM_freeN.
Diffstat (limited to 'intern')
-rw-r--r--intern/guardedalloc/intern/mallocn.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c
index 2f6b91b9711..65d3c11bc23 100644
--- a/intern/guardedalloc/intern/mallocn.c
+++ b/intern/guardedalloc/intern/mallocn.c
@@ -745,7 +745,6 @@ void MEM_printmemlist_pydict(void)
void MEM_freeN(void *vmemh)
{
- short error = 0;
MemTail *memt;
MemHead *memh = vmemh;
const char *name;
@@ -753,26 +752,26 @@ void MEM_freeN(void *vmemh)
if (memh == NULL) {
MemorY_ErroR("free", "attempt to free NULL pointer");
/* print_error(err_stream, "%d\n", (memh+4000)->tag1); */
- return(-1);
+ return;
}
if (sizeof(intptr_t) == 8) {
if (((intptr_t) memh) & 0x7) {
MemorY_ErroR("free", "attempt to free illegal pointer");
- return(-1);
+ return;
}
}
else {
if (((intptr_t) memh) & 0x3) {
MemorY_ErroR("free", "attempt to free illegal pointer");
- return(-1);
+ return;
}
}
memh--;
if (memh->tag1 == MEMFREE && memh->tag2 == MEMFREE) {
MemorY_ErroR(memh->name, "double free");
- return(-1);
+ return;
}
mem_lock_thread();
@@ -790,10 +789,9 @@ void MEM_freeN(void *vmemh)
rem_memblock(memh);
mem_unlock_thread();
-
- return(0);
+
+ return;
}
- error = 2;
MemorY_ErroR(memh->name, "end corrupt");
name = check_memlist(memh);
if (name != NULL) {
@@ -801,7 +799,6 @@ void MEM_freeN(void *vmemh)
}
}
else {
- error = -1;
name = check_memlist(memh);
if (name == NULL)
MemorY_ErroR("free", "pointer not in memlist");
@@ -814,7 +811,7 @@ void MEM_freeN(void *vmemh)
mem_unlock_thread();
- return(error);
+ return;
}
/* --------------------------------------------------------------------- */