[Bf-blender-cvs] [ee9d60b] master: Remove feof check for file reading

[Campbell Barton]

Commit: ee9d60b033409bea77106d15f87631ad601b9f89
Author: Campbell Barton
Date:   Wed Dec 23 17:45:46 2015 +1100
Branches: master
https://developer.blender.org/rBee9d60b033409bea77106d15f87631ad601b9f89

Remove feof check for file reading

This wasnt correct since we're not reading past the stream,
though it worked on Linux and some Windows systems.

===================================================================

M	source/blender/blenlib/intern/storage.c

===================================================================

diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c
index 5c300e9..91df103 100644
--- a/source/blender/blenlib/intern/storage.c
+++ b/source/blender/blenlib/intern/storage.c
@@ -306,7 +306,7 @@ void *BLI_file_read_text_as_mem(const char *filepath, size_t pad_bytes, size_t *
 		}
 
 		const long int filelen_read = fread(mem, 1, filelen, fp);
-		if ((filelen_read < 0) || (!feof(fp) ) || ferror(fp)) {
+		if ((filelen_read < 0) || ferror(fp)) {
 			MEM_freeN(mem);
 			mem = NULL;
 			goto finally;
@@ -346,7 +346,7 @@ void *BLI_file_read_binary_as_mem(const char *filepath, size_t pad_bytes, size_t
 		}
 
 		const long int filelen_read = fread(mem, 1, filelen, fp);
-		if ((filelen_read != filelen) || (!feof(fp) ) || ferror(fp)) {
+		if ((filelen_read != filelen) || ferror(fp)) {
 			MEM_freeN(mem);
 			mem = NULL;
 			goto finally;