diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-22 19:35:49 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-22 19:35:49 +0400 |
commit | e417e011d558693b9ff9cd048efe9cbe79da74be (patch) | |
tree | 36612e30bf5c561051635c8eef7180d29251e846 /source/blender/blenloader | |
parent | c1de5cc83829b65094eee024af10928bd13261ce (diff) |
Code cleanup: file operations merged into single header, some function names
made less cryptic and changed to indicate if they work on files or directories.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readblenentry.c | 8 | ||||
-rw-r--r-- | source/blender/blenloader/intern/runtime.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/writefile.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c index ded5a95df5a..09e6dcd7bf9 100644 --- a/source/blender/blenloader/intern/readblenentry.c +++ b/source/blender/blenloader/intern/readblenentry.c @@ -34,7 +34,6 @@ #include <stddef.h> -#include "BLI_storage.h" /* _LARGEFILE_SOURCE */ #include <stdlib.h> #include <string.h> @@ -43,11 +42,12 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_listbase.h" -#include "BLI_string.h" +#include "BLI_fileops.h" #include "BLI_ghash.h" #include "BLI_linklist.h" +#include "BLI_listbase.h" +#include "BLI_string.h" +#include "BLI_utildefines.h" #include "DNA_genfile.h" #include "DNA_sdna_types.h" diff --git a/source/blender/blenloader/intern/runtime.c b/source/blender/blenloader/intern/runtime.c index 7a241e007f2..57cdce94b17 100644 --- a/source/blender/blenloader/intern/runtime.c +++ b/source/blender/blenloader/intern/runtime.c @@ -111,7 +111,7 @@ BlendFileData *BLO_read_runtime(const char *path, ReportList *reports) goto cleanup; } - actualsize= BLI_filesize(fd); + actualsize= BLI_file_descriptor_size(fd); lseek(fd, -12, SEEK_END); diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 8959a1ed017..752677d047d 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -2734,7 +2734,7 @@ int BLO_write_file(Main *mainvar, const char *filepath, int write_flags, ReportL /* first write compressed to separate @.gz */ BLI_snprintf(gzname, sizeof(gzname), "%s@.gz", filepath); - ret = BLI_gzip(tempname, gzname); + ret = BLI_file_gzip(tempname, gzname); if(0==ret) { /* now rename to real file name, and delete temp @ file too */ |