diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-12 19:02:10 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-12 19:02:10 +0400 |
commit | 2f2b15bbb2a30ee312d65c627d54a12445f4b987 (patch) | |
tree | 7d2d442d5351a04887bbe4aac0f039c3f1d416cd /source/blender/blenloader/intern/undofile.c | |
parent | 23c0d49a7c6aacde784843b14d5b3eece7fe61df (diff) |
style cleanup: whitespace, bli & makesdna
Diffstat (limited to 'source/blender/blenloader/intern/undofile.c')
-rw-r--r-- | source/blender/blenloader/intern/undofile.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/source/blender/blenloader/intern/undofile.c b/source/blender/blenloader/intern/undofile.c index 75fa8d0c3d2..21a9290968b 100644 --- a/source/blender/blenloader/intern/undofile.c +++ b/source/blender/blenloader/intern/undofile.c @@ -56,11 +56,11 @@ void BLO_free_memfile(MemFile *memfile) MemFileChunk *chunk; while ( (chunk = (memfile->chunks.first) ) ) { - if (chunk->ident==0) MEM_freeN(chunk->buf); + if (chunk->ident == 0) MEM_freeN(chunk->buf); BLI_remlink(&memfile->chunks, chunk); MEM_freeN(chunk); } - memfile->size= 0; + memfile->size = 0; } /* to keep list of memfiles consistent, 'first' is always first in list */ @@ -69,17 +69,17 @@ void BLO_merge_memfile(MemFile *first, MemFile *second) { MemFileChunk *fc, *sc; - fc= first->chunks.first; - sc= second->chunks.first; + fc = first->chunks.first; + sc = second->chunks.first; while (fc || sc) { if (fc && sc) { if (sc->ident) { - sc->ident= 0; - fc->ident= 1; + sc->ident = 0; + fc->ident = 1; } } - if (fc) fc= fc->next; - if (sc) sc= sc->next; + if (fc) fc = fc->next; + if (sc) sc = sc->next; } BLO_free_memfile(first); @@ -92,7 +92,7 @@ static int my_memcmp(const int *mem1, const int *mem2, const int len) register const int *memb = mem2; while (a--) { - if ( *mema != *memb) return 1; + if (*mema != *memb) return 1; mema++; memb++; } @@ -101,39 +101,39 @@ static int my_memcmp(const int *mem1, const int *mem2, const int len) void add_memfilechunk(MemFile *compare, MemFile *current, const char *buf, unsigned int size) { - static MemFileChunk *compchunk=NULL; + static MemFileChunk *compchunk = NULL; MemFileChunk *curchunk; /* this function inits when compare != NULL or when current==NULL */ if (compare) { - compchunk= compare->chunks.first; + compchunk = compare->chunks.first; return; } - if (current==NULL) { - compchunk= NULL; + if (current == NULL) { + compchunk = NULL; return; } - curchunk= MEM_mallocN(sizeof(MemFileChunk), "MemFileChunk"); - curchunk->size= size; - curchunk->buf= NULL; - curchunk->ident= 0; + curchunk = MEM_mallocN(sizeof(MemFileChunk), "MemFileChunk"); + curchunk->size = size; + curchunk->buf = NULL; + curchunk->ident = 0; BLI_addtail(¤t->chunks, curchunk); /* we compare compchunk with buf */ if (compchunk) { if (compchunk->size == curchunk->size) { if (my_memcmp((int *)compchunk->buf, (const int *)buf, size / 4) == 0) { - curchunk->buf= compchunk->buf; - curchunk->ident= 1; + curchunk->buf = compchunk->buf; + curchunk->ident = 1; } } - compchunk= compchunk->next; + compchunk = compchunk->next; } /* not equal... */ - if (curchunk->buf==NULL) { - curchunk->buf= MEM_mallocN(size, "Chunk buffer"); + if (curchunk->buf == NULL) { + curchunk->buf = MEM_mallocN(size, "Chunk buffer"); memcpy(curchunk->buf, buf, size); current->size += size; } |