Added initial emulator configuration window, cleanup of settings code.

[apple2] / src / fileio.cpp

diff --git a/src/fileio.cpp b/src/fileio.cpp
index efa4c61b6d9c2dd9c0ceb9fd449497957a8ee958..ccda0d71369582574fa3c27e2f6624a2bd4953cf 100644 (file)
--- a/src/fileio.cpp
+++ b/src/fileio.cpp
@@ -31,9 +31,9 @@ uint8_t standardTMAP[160] = {
 
 
 //
-// Note that size *must* be a valid pointer, otherwise this will go BOOM
+// sizePtr is optional
 //
-uint8_t * ReadFile(const char * filename, uint32_t * size)
+uint8_t * ReadFile(const char * filename, uint32_t * sizePtr/*= NULL*/)
 {
        FILE * fp = fopen(filename, "rb");
 
@@ -41,13 +41,16 @@ uint8_t * ReadFile(const char * filename, uint32_t * size)
                return NULL;
 
        fseek(fp, 0, SEEK_END);
-       *size = ftell(fp);
+       uint32_t size = ftell(fp);
        fseek(fp, 0, SEEK_SET);
 
-       uint8_t * buffer = (uint8_t *)malloc(*size);
-       fread(buffer, 1, *size, fp);
+       uint8_t * buffer = (uint8_t *)malloc(size);
+       fread(buffer, 1, size, fp);
        fclose(fp);
 
+       if (sizePtr != NULL)
+               *sizePtr = size;
+
        return buffer;
 }