From 551096d6fd414510c4d726d0dae2f9703cb440d9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 22 Apr 2014 16:40:17 +1000 Subject: BLI_open: check returned value for `-1` instead of `< 0` --- source/blender/blenkernel/intern/blender.c | 2 +- source/blender/blenkernel/intern/image.c | 2 +- source/blender/blenkernel/intern/movieclip.c | 2 +- source/blender/blenkernel/intern/packedFile.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source/blender/blenkernel/intern') diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 9b1f2e87f9e..c238052c268 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -820,7 +820,7 @@ int BKE_undo_save_file(const char *filename) * to avoid writing to a symlink - use 'O_EXCL' (CVE-2008-1103) */ errno = 0; file = BLI_open(filename, flag, 0666); - if (file < 0) { + if (file == -1) { if (errno == EEXIST) { errno = 0; file = BLI_open(filename, flag & ~O_CREAT, 0666); diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index c0c028632cf..343d82e7341 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -635,7 +635,7 @@ Image *BKE_image_load(Main *bmain, const char *filepath) /* exists? */ file = BLI_open(str, O_BINARY | O_RDONLY, 0); - if (file < 0) + if (file == -1) return NULL; close(file); diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index 5012c08d95d..63f0d05809f 100644 --- a/source/blender/blenkernel/intern/movieclip.c +++ b/source/blender/blenkernel/intern/movieclip.c @@ -626,7 +626,7 @@ MovieClip *BKE_movieclip_file_add(Main *bmain, const char *name) /* exists? */ file = BLI_open(str, O_BINARY | O_RDONLY, 0); - if (file < 0) + if (file == -1) return NULL; close(file); diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index 71504bb9fbe..fc8a23a7782 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 == -1) { BKE_reportf(reports, RPT_ERROR, "Unable to pack file, source path '%s' not found", name); } else { @@ -331,7 +331,7 @@ 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 == -1) { BKE_reportf(reports, RPT_ERROR, "Error creating file '%s'", name); ret_value = RET_ERROR; } @@ -394,7 +394,7 @@ int checkPackedFile(const char *filename, PackedFile *pf) /* we'll have to compare the two... */ file = BLI_open(name, O_BINARY | O_RDONLY, 0); - if (file < 0) { + if (file == -1) { ret_val = PF_NOFILE; } else { -- cgit v1.2.3