archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Code cleanup: file operations merged into single header, some function names

Browse Source 
made less cryptic and changed to indicate if they work on files or directories.
This commit is contained in:
Brecht Van Lommel
2011-10-22 15:35:49 +00:00
parent c1de5cc838
commit e417e011d5
39 changed files with 137 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/interface/interface_icons.c
View File

@@ -47,7 +47,6 @@
#include "BLI_math.h"
#include "BLI_blenlib.h"
#include "BLI_storage_types.h"
#include "BLI_utildefines.h"
#include "DNA_brush_types.h"
@@ -609,11 +608,11 @@ static void init_iconfile_list(struct ListBase *list)
if(icondir==NULL)
return;
/* since BLI_getdir changes the current working directory, restore it
/* since BLI_dir_contents changes the current working directory, restore it
back to old value afterwards */
if(!BLI_getwdN(olddir, sizeof(olddir)))
if(!BLI_current_working_dir(olddir, sizeof(olddir)))
restoredir = 0;
totfile = BLI_getdir(icondir, &dir);
totfile = BLI_dir_contents(icondir, &dir);
if (restoredir && !chdir(olddir)) {} /* fix warning about checking return value */
for(i=0; i<totfile; i++) {
@@ -662,7 +661,7 @@ static void init_iconfile_list(struct ListBase *list)
}
}
/* free temporary direntry structure that's been created by BLI_getdir() */
/* free temporary direntry structure that's been created by BLI_dir_contents() */
i= totfile-1;
for(; i>=0; i--){