diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-08-04 21:30:47 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-04 21:30:47 +0400 |
commit | d2dbc0b85eccd5989286c063b94f78f18992d3df (patch) | |
tree | 6f731bc07b271fba8922d3fce61e3fdc462eacda /source/blender/blenkernel/intern/packedFile.c | |
parent | aa43a978c187e6f9e941279f7393cdc2eb399212 (diff) |
more consistent use of checks of BLI_open(), check 'fd < 0' rather then -1. packedfile incorrectly treated 0 as an error value. best not be vague/sloppy with this.
Diffstat (limited to 'source/blender/blenkernel/intern/packedFile.c')
-rw-r--r-- | source/blender/blenkernel/intern/packedFile.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index 11d58c945fd..62ea16b9fb4 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -202,7 +202,7 @@ PackedFile *newPackedFile(ReportList *reports, const char *filename, const char * and create a PackedFile structure */ file = BLI_open(name, O_BINARY | O_RDONLY, 0); - if (file <= 0) { + if (file < 0) { BKE_reportf(reports, RPT_ERROR, "Unable to pack file, source path '%s' not found", name); } else { @@ -327,20 +327,21 @@ int writePackedFile(ReportList *reports, const char *filename, PackedFile *pf, i BLI_make_existing_file(name); file = BLI_open(name, O_BINARY + O_WRONLY + O_CREAT + O_TRUNC, 0666); - if (file >= 0) { + if (file < 0) { + BKE_reportf(reports, RPT_ERROR, "Error creating file '%s'", name); + ret_value = RET_ERROR; + } + else { if (write(file, pf->data, pf->size) != pf->size) { BKE_reportf(reports, RPT_ERROR, "Error writing file '%s'", name); ret_value = RET_ERROR; } - else + else { BKE_reportf(reports, RPT_INFO, "Saved packed file to: %s", name); + } close(file); } - else { - BKE_reportf(reports, RPT_ERROR, "Error creating file '%s'", name); - ret_value = RET_ERROR; - } if (remove_tmp) { if (ret_value == RET_ERROR) { |