Changeset 247 for cpp/common/stl-util.cpp

Timestamp:

11/07/14 17:51:01 (10 years ago)

Author:

Maciej Komosinski

Message:

Sources support both 32-bit and 64-bit, and more compilers

File:

• cpp/common/stl-util.cpp (modified) (4 diffs)

cpp/common/stl-util.cpp

@@ -10 +10 @@
 #include "framsg.h"
 #include <assert.h>
+#ifdef USE_VIRTFILE
+ #include <frams/virtfile/virtfile.h>
+#endif
+#ifdef __BORLANDC__
+ #define va_copy(to,from) to=from //borland does not have va_copy() at all; va_list is just a pointer in borland
+#endif
 
 string ssprintf_va(const char* format, va_list ap)
@@ -16 +22 @@
         long size = 256;
         char* buf;
+        va_list ap_copy; // "va_list ap" can only by used once by printf-type functions as they advance the current argument pointer (crashed on linux x86_64)
+        // (does not apply to SString::sprintf, it does not have the va_list variant)
 
         //almost like SString::sprintf, but there is no common code to share because SString can use its directWrite to avoid double allocating/copying
 #ifdef USE_VSCPRINTF
-        size = _vscprintf(format, ap) + 1; //+1 for terminating null character
+        va_copy(ap_copy,ap);
+        size = _vscprintf(format, ap_copy) + 1; //+1 for terminating null character
+        va_end(ap_copy);
 #endif
 
@@ -26 +36 @@
                 buf = (char*)malloc(size);
                 assert(buf != NULL);
-                int n = vsnprintf(buf, size, format, ap);
+                va_copy(ap_copy,ap);
+                int n = vsnprintf(buf, size, format, ap_copy);
+                va_end(ap_copy);
                 if (n > -1 && n < size)
                 {
@@ -54 +66 @@
 bool readCompleteFile(const char* filename, vector<char>& data, bool warn_on_missing_file)
 {
+    bool ok=false;
+#ifdef USE_VIRTFILE
+        if (!isAbsolutePath(filename))
+                {
+                VirtFILE *f=Vfopen(filename,FOPEN_READ_BINARY);
+                if (f)
+                        {
+                        int size=f->getSize();
+                        data.resize(size);
+                        int przeczytane = f->Vread(&data[0], size, 1);
+                        ok = przeczytane == 1;
+                        delete f;
+                        }
+                }
+        else
+#endif
+        {
         MFILE *f = mfopen(filename, FOPEN_READ_BINARY);
-        bool ok = f != NULL;
         if (f)
         {
-                mfseek(f, 0, SEEK_END);
-                long size = mftell(f);
-                mfseek(f, 0, SEEK_SET);
+                int size=getFileSize(f);
                 data.resize(size);
                 int przeczytane = mfread(&data[0], size, 1, f);
                 mfclose(f);
-                ok &= przeczytane == 1;
+                ok = przeczytane == 1;
+        }
         }
         if (warn_on_missing_file && !ok)