patch [#34103] dir_contents.patch
from Lawrence D'Oliveiro (ldo) - storage.c: Simplify BLI_dir_contents and make it and its internal subsidiary routines reentrant - Moved common code for disposal of a struct direntry to new routine BLI_free_filelist in storage.c, and put calls to it in interface_icons.c and filelist.c - Took out inclusion of BLI_fileops_types.h from BLI_fileops.h and put it explicitly into .c files that need it (which turned out to be only 7 of the 35 files that were including the former)
This commit is contained in:
@@ -34,14 +34,12 @@
|
||||
#define __BLI_FILEOPS_H__
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include <sys/stat.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include "BLI_fileops_types.h"
|
||||
|
||||
/* for size_t (needed on windows) */
|
||||
#include <stddef.h>
|
||||
|
||||
@@ -68,6 +66,7 @@ double BLI_dir_free_space(const char *dir);
|
||||
char *BLI_current_working_dir(char *dir, const size_t maxlen);
|
||||
|
||||
unsigned int BLI_dir_contents(const char *dir, struct direntry **filelist);
|
||||
void BLI_free_filelist(struct direntry * filelist, unsigned int nrentries);
|
||||
|
||||
/* Files */
|
||||
|
||||
|
Reference in New Issue
Block a user