portability: avoid errors on some compilers

[flatwaifu.git] / src / common / files.c

diff --git a/src/common/files.c b/src/common/files.c
index 8961c0377f4053cfa982baf708333b90c778dc6b..f1eeb591f52abbaadbd93bcd9264d2786ef3b90c 100644 (file)
--- a/src/common/files.c
+++ b/src/common/files.c
@@ -1,36 +1,40 @@
-#include "files.h"
+#include "common/files.h"
 
 #include <stdio.h>
 #include <stdint.h>
 #include <assert.h>
 
 static long FILE_Stream_GetPos (Stream *r) {
+  long pos;
   FILE_Stream *rd = (FILE_Stream*)r;
   assert(rd != NULL);
   assert(rd->fp != NULL);
-  long pos = ftell(rd->fp);
+  pos = ftell(rd->fp);
   assert(pos != -1); // fail
   return pos;
 }
 
 static void FILE_Stream_SetPos (Stream *r, long pos) {
+  int res;
   FILE_Stream *rd = (FILE_Stream*)r;
   assert(rd != NULL);
   assert(rd->fp != NULL);
   assert(pos >= 0);
-  int res = fseek(rd->fp, pos, SEEK_SET);
+  res = fseek(rd->fp, pos, SEEK_SET);
   assert(res == 0); // fail
 }
 
 static long FILE_Stream_GetLen (Stream *r) {
+  int res;
+  long pos, len;
   FILE_Stream *rd = (FILE_Stream*)r;
   assert(rd != NULL);
   assert(rd->fp != NULL);
-  long pos = ftell(rd->fp);
+  pos = ftell(rd->fp);
   assert(pos != -1); // fail get cur pos
-  int res = fseek(rd->fp, 0, SEEK_END);
+  res = fseek(rd->fp, 0, SEEK_END);
   assert(res == 0); // fail jump to end
-  long len = ftell(rd->fp);
+  len = ftell(rd->fp);
   res = fseek(rd->fp, pos, SEEK_SET);
   assert(res == 0); // fail return
   assert(len != -1); // fail get length
@@ -38,18 +42,20 @@ static long FILE_Stream_GetLen (Stream *r) {
 }
 
 static void FILE_Stream_Read (Stream *r, void *data, size_t size, size_t n) {
+  size_t res;
   FILE_Stream *rd = (FILE_Stream*)r;
   assert(rd != NULL);
   assert(rd->fp != NULL);
-  size_t res = fread(data, size, n, rd->fp);
+  res = fread(data, size, n, rd->fp);
   assert(res == n); // fail
 }
 
 static void FILE_Stream_Write (Stream *w, const void *data, size_t size, size_t n) {
+  size_t res;
   FILE_Stream *wr = (FILE_Stream*)w;
   assert(wr != NULL);
   assert(wr->fp != NULL);
-  size_t res = fwrite(data, size, n, wr->fp);
+  res = fwrite(data, size, n, wr->fp);
   assert(res == n); // fail
 }
 
@@ -65,9 +71,10 @@ void FILE_Assign (FILE_Stream *r, FILE *fp) {
 }
 
 int FILE_Open (FILE_Stream *r, const char *name, const char *mode) {
+  FILE *fp;
   assert(r != NULL);
   assert(name != NULL);
-  FILE *fp = fopen(name, mode);
+  fp = fopen(name, mode);
   if (fp) {
     FILE_Assign(r, fp);
   }