diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-04 23:34:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-04 23:34:38 +0400 |
| commit | 3d204744147c136a2d57ca3ba52e424b50ea48c2 (patch) | |
| tree | 479508a40e6c27b38d2641a75ae44c1adedca13c /source/blender/blenloader | |
| parent | 97e9659c537359f24a49b5cf9d8dcbb13947cb36 (diff) | |
style cleanup
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 14 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index f05ab16eb82..e1095d25b1d 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -8091,14 +8091,14 @@ BlendFileData *blo_read_file_internal(FileData *fd, const char *filepath) /* ************* APPEND LIBRARY ************** */ -struct bheadsort { +struct BHeadSort { BHead *bhead; void *old; }; static int verg_bheadsort(const void *v1, const void *v2) { - const struct bheadsort *x1=v1, *x2=v2; + const struct BHeadSort *x1=v1, *x2=v2; if (x1->old > x2->old) return 1; else if (x1->old < x2->old) return -1; @@ -8108,7 +8108,7 @@ static int verg_bheadsort(const void *v1, const void *v2) static void sort_bhead_old_map(FileData *fd) { BHead *bhead; - struct bheadsort *bhs; + struct BHeadSort *bhs; int tot = 0; for (bhead = blo_firstbhead(fd); bhead; bhead = blo_nextbhead(fd, bhead)) @@ -8117,14 +8117,14 @@ static void sort_bhead_old_map(FileData *fd) fd->tot_bheadmap = tot; if (tot == 0) return; - bhs = fd->bheadmap = MEM_mallocN(tot*sizeof(struct bheadsort), "bheadsort"); + bhs = fd->bheadmap = MEM_mallocN(tot*sizeof(struct BHeadSort), STRINGIFY(BHeadSort)); for (bhead = blo_firstbhead(fd); bhead; bhead = blo_nextbhead(fd, bhead), bhs++) { bhs->bhead = bhead; bhs->old = bhead->old; } - qsort(fd->bheadmap, tot, sizeof(struct bheadsort), verg_bheadsort); + qsort(fd->bheadmap, tot, sizeof(struct BHeadSort), verg_bheadsort); } static BHead *find_previous_lib(FileData *fd, BHead *bhead) @@ -8146,7 +8146,7 @@ static BHead *find_bhead(FileData *fd, void *old) #if 0 BHead *bhead; #endif - struct bheadsort *bhs, bhs_s; + struct BHeadSort *bhs, bhs_s; if (!old) return NULL; @@ -8155,7 +8155,7 @@ static BHead *find_bhead(FileData *fd, void *old) sort_bhead_old_map(fd); bhs_s.old = old; - bhs = bsearch(&bhs_s, fd->bheadmap, fd->tot_bheadmap, sizeof(struct bheadsort), verg_bheadsort); + bhs = bsearch(&bhs_s, fd->bheadmap, fd->tot_bheadmap, sizeof(struct BHeadSort), verg_bheadsort); if (bhs) return bhs->bhead; diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h index a3aa8e783a0..a979a16220d 100644 --- a/source/blender/blenloader/intern/readfile.h +++ b/source/blender/blenloader/intern/readfile.h @@ -84,7 +84,7 @@ typedef struct FileData { struct OldNewMap *imamap; struct OldNewMap *movieclipmap; - struct bheadsort *bheadmap; + struct BHeadSort *bheadmap; int tot_bheadmap; ListBase *mainlist; |