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
diff options
context:
space:
mode:
Diffstat (limited to 'intern/guardedalloc/intern/mallocn.c')
-rw-r--r--intern/guardedalloc/intern/mallocn.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c
index f1c9f9e6363..55340d6011d 100644
--- a/intern/guardedalloc/intern/mallocn.c
+++ b/intern/guardedalloc/intern/mallocn.c
@@ -369,16 +369,16 @@ void *MEM_mapallocN(size_t len, const char *str)
{
#include <fcntl.h>
- int fd;
- fd = open("/dev/zero", O_RDWR);
+ int fd;
+ fd = open("/dev/zero", O_RDWR);
- memh= mmap(0, len+sizeof(MemHead)+sizeof(MemTail),
- PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
- close(fd);
+ memh= mmap(0, len+sizeof(MemHead)+sizeof(MemTail),
+ PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+ close(fd);
}
#else
memh= mmap(NULL, len+sizeof(MemHead)+sizeof(MemTail),
- PROT_READ|PROT_WRITE, MAP_SHARED|MAP_ANON, -1, 0);
+ PROT_READ|PROT_WRITE, MAP_SHARED|MAP_ANON, -1, 0);
#endif
if(memh!=(MemHead *)-1) {
@@ -698,26 +698,26 @@ static void remlink(volatile localListBase *listbase, void *vlink)
static void rem_memblock(MemHead *memh)
{
- remlink(membase,&memh->next);
- if (memh->prev) {
- if (memh->next)
+ remlink(membase,&memh->next);
+ if (memh->prev) {
+ if (memh->next)
MEMNEXT(memh->prev)->nextname = MEMNEXT(memh->next)->name;
- else
+ else
MEMNEXT(memh->prev)->nextname = NULL;
- }
-
- totblock--;
- mem_in_use -= memh->len;
-
- if(memh->mmap) {
- mmap_in_use -= memh->len;
- if (munmap(memh, memh->len + sizeof(MemHead) + sizeof(MemTail)))
- printf("Couldn't unmap memory %s\n", memh->name);
- }
+ }
+
+ totblock--;
+ mem_in_use -= memh->len;
+
+ if(memh->mmap) {
+ mmap_in_use -= memh->len;
+ if (munmap(memh, memh->len + sizeof(MemHead) + sizeof(MemTail)))
+ printf("Couldn't unmap memory %s\n", memh->name);
+ }
else {
if(malloc_debug_memset && memh->len)
memset(memh+1, 255, memh->len);
- free(memh);
+ free(memh);
}
}
@@ -792,7 +792,7 @@ static const char *check_memlist(MemHead *memh)
forwok->nextname = backok->name;
} else{
forwok->next = NULL;
- membase->last = (struct localLink *) &forwok->next;
+ membase->last = (struct localLink *) &forwok->next;
/* membase->last = (struct Link *) &forwok->next; */
}
} else{