[Bf-blender-cvs] [216ddcc09bd] master: Cleanup: rename FileData.listbase -> bhead_list
Campbell Barton
noreply at git.blender.org
Sun Mar 3 15:03:50 CET 2019
Commit: 216ddcc09bde3e06cc35a97f0831a1a0df320a52
Author: Campbell Barton
Date: Mon Mar 4 01:01:52 2019 +1100
Branches: master
https://developer.blender.org/rB216ddcc09bde3e06cc35a97f0831a1a0df320a52
Cleanup: rename FileData.listbase -> bhead_list
Having the name matching the type isn't so meaningful.
===================================================================
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/readfile.h
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index dc988afaabe..572946cac48 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -880,7 +880,7 @@ static BHeadN *get_bhead(FileData *fd)
* of blocks.
*/
if (new_bhead) {
- BLI_addtail(&fd->listbase, new_bhead);
+ BLI_addtail(&fd->bhead_list, new_bhead);
}
return new_bhead;
@@ -894,7 +894,7 @@ BHead *blo_bhead_first(FileData *fd)
/* Rewind the file
* Read in a new block if necessary
*/
- new_bhead = fd->listbase.first;
+ new_bhead = fd->bhead_list.first;
if (new_bhead == NULL) {
new_bhead = get_bhead(fd);
}
@@ -1493,10 +1493,10 @@ void blo_filedata_free(FileData *fd)
/* Free all BHeadN data blocks */
#ifndef NDEBUG
- BLI_freelistN(&fd->listbase);
+ BLI_freelistN(&fd->bhead_list);
#else
/* Sanity check we're not keeping memory we don't need. */
- LISTBASE_FOREACH_MUTABLE (BHeadN *, new_bhead, &fd->listbase) {
+ LISTBASE_FOREACH_MUTABLE (BHeadN *, new_bhead, &fd->bhead_list) {
if (fd->seek != NULL && BHEAD_USE_READ_ON_DEMAND(&new_bhead->bhead)) {
BLI_assert(new_bhead->has_data == 0);
}
diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h
index 49ae2849f4f..9e970b9ae5d 100644
--- a/source/blender/blenloader/intern/readfile.h
+++ b/source/blender/blenloader/intern/readfile.h
@@ -55,7 +55,7 @@ typedef off_t (FileDataSeekFn)(struct FileData *filedata, off_t offset, int when
typedef struct FileData {
/** Linked list of BHeadN's. */
- ListBase listbase;
+ ListBase bhead_list;
enum eFileDataFlag flags;
bool is_eof;
int buffersize;
More information about the Bf-blender-cvs
mailing list