[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56938] trunk/blender/intern/guardedalloc/ intern/mallocn.c: Fix build error after removing return value from MEM_freeN.

[Brecht Van Lommel]

Revision: 56938
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56938
Author:   blendix
Date:     2013-05-21 10:13:42 +0000 (Tue, 21 May 2013)
Log Message:
-----------
Fix build error after removing return value from MEM_freeN.

Modified Paths:
--------------
    trunk/blender/intern/guardedalloc/intern/mallocn.c

Modified: trunk/blender/intern/guardedalloc/intern/mallocn.c
===================================================================
--- trunk/blender/intern/guardedalloc/intern/mallocn.c  2013-05-21 08:45:10 UTC 
(rev 56937)
+++ trunk/blender/intern/guardedalloc/intern/mallocn.c  2013-05-21 10:13:42 UTC 
(rev 56938)
@@ -745,7 +745,6 @@
 
 void MEM_freeN(void *vmemh)
 {
-       short error = 0;
        MemTail *memt;
        MemHead *memh = vmemh;
        const char *name;
@@ -753,26 +752,26 @@
        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 @@
                        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 @@
                }
        }
        else {
-               error = -1;
                name = check_memlist(memh);
                if (name == NULL)
                        MemorY_ErroR("free", "pointer not in memlist");
@@ -814,7 +811,7 @@
 
        mem_unlock_thread();
 
-       return(error);
+       return;
 }
 
 /* --------------------------------------------------------------------- */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs