sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Updated mallocn.c MEM_check_memory_integrity was casting

Browse Source 
a string as an int and it was causing a warning.
I changed it to check to see if the string == 0
return 0 else return 1.

The only thing that called this function was memtest.c and it
had outdated code, so I fixed that...
        was calling MEM_set_error_stream updated to
                    MEM_set_error_callback

Kent
This commit is contained in:
Kent Mein 2006-03-23 17:45:40 +00:00
parent a837e1e8c0
commit 391ae8f7ac
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
intern/guardedalloc/intern/mallocn.c
View File

@ -157,7 +157,8 @@ int MEM_check_memory_integrity()
err_val = check_memlist(listend);
return (int)err_val;
if (err_val == 0) return 0;
return 1;
}

4
intern/guardedalloc/test/simpletest/memtest.c
View File

@ -78,7 +78,7 @@ int main (int argc, char *argv[])
/* Round one, do a normal allocation, and free the blocks again. */
/* ----------------------------------------------------------------- */
/* flush mem lib output to stderr */
MEM_set_error_stream(stderr);
MEM_set_error_callback(stderr);
for (i = 0; i < NUM_BLOCKS; i++) {
int blocksize = 10000;
@ -110,7 +110,7 @@ int main (int argc, char *argv[])
/* Round two, do a normal allocation, and corrupt some blocks. */
/* ----------------------------------------------------------------- */
/* switch off, because it will complain about some things. */
MEM_set_error_stream(NULL);
MEM_set_error_callback(NULL);
for (i = 0; i < NUM_BLOCKS; i++) {
int blocksize = 10000;