blender
/
blender
130
398
Fork 573
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Cleanup: rename FileData.listbase -> bhead_list 

Having the name matching the type isn't so meaningful.
This commit is contained in:
Campbell Barton 2019-03-04 01:01:52 +11:00
parent 2d468fc072
commit 216ddcc09b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenloader/intern/readfile.c
View File

@ -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);
}

2
source/blender/blenloader/intern/readfile.h
View File

@ -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;