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/blenkernel/intern | |
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/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/effect.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/fluidsim.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/packedFile.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 1 |
5 files changed, 3 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index f728916a158..e3e769253f1 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -33,7 +33,6 @@ #include <stddef.h> -#include "BLI_storage.h" /* _LARGEFILE_SOURCE */ #include <math.h> #include <stdlib.h> diff --git a/source/blender/blenkernel/intern/fluidsim.c b/source/blender/blenkernel/intern/fluidsim.c index 1c2f1c8487c..9247646b927 100644 --- a/source/blender/blenkernel/intern/fluidsim.c +++ b/source/blender/blenkernel/intern/fluidsim.c @@ -33,7 +33,6 @@ #include <stddef.h> -#include "BLI_storage.h" /* _LARGEFILE_SOURCE */ #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index 0041cd33c14..70b0b7727c4 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -192,7 +192,7 @@ PackedFile *newPackedFile(ReportList *reports, const char *filename, const char if (file <= 0) { BKE_reportf(reports, RPT_ERROR, "Unable to pack file, source path not found: \"%s\"", name); } else { - filelen = BLI_filesize(file); + filelen = BLI_file_descriptor_size(file); if (filelen == 0) { // MEM_mallocN complains about MEM_mallocN(0, "bla"); @@ -283,7 +283,7 @@ int writePackedFile(ReportList *reports, const char *filename, PackedFile *pf, i for (number = 1; number <= 999; number++) { BLI_snprintf(tempname, sizeof(tempname), "%s.%03d_", name, number); if (! BLI_exists(tempname)) { - if (BLI_copy_fileops(name, tempname) == RET_OK) { + if (BLI_copy(name, tempname) == RET_OK) { remove_tmp = TRUE; } break; diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index c642f76d400..cebefe81495 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -36,7 +36,6 @@ #include <stddef.h> -#include "BLI_storage.h" /* _LARGEFILE_SOURCE */ #include <stdlib.h> #include <math.h> @@ -64,7 +63,7 @@ #include "BLI_rand.h" #include "BLI_jitter.h" #include "BLI_math.h" -#include "BLI_blenlib.h" /* BLI_storage.h For _LARGEFILE64_SOURCE; zlib needs this on some systems */ +#include "BLI_blenlib.h" #include "BLI_kdtree.h" #include "BLI_kdopbvh.h" #include "BLI_threads.h" diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index e0e61a71dc2..cf03a8d3f36 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -51,7 +51,6 @@ #include "BLI_listbase.h" #include "BLI_path_util.h" #include "BLI_string.h" -#include "BLI_storage.h" #include "BLI_threads.h" #include "BLI_utildefines.h" |