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

Timestamp:

12/03/14 18:52:05 (10 years ago)

Author:

Maciej Komosinski

Message:

• added strmove(): strcpy() for overlapping strings
• ExtObject? operator== can handle NULL arguments
• source formatting and improved genetic operator messages

File:

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

cpp/common/stl-util.cpp

@@ -11 +11 @@
 #include <assert.h>
 #ifdef USE_VIRTFILE
- #include <frams/virtfile/virtfile.h>
+#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
+#define va_copy(to,from) to=from //borland does not have va_copy() at all; va_list is just a pointer in borland
 #endif
 
@@ -27 +27 @@
         //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
-        va_copy(ap_copy,ap);
+        va_copy(ap_copy, ap);
         size = _vscprintf(format, ap_copy) + 1; //+1 for terminating null character
         va_end(ap_copy);
@@ -36 +36 @@
                 buf = (char*)malloc(size);
                 assert(buf != NULL);
-                va_copy(ap_copy,ap);
+                va_copy(ap_copy, ap);
                 int n = vsnprintf(buf, size, format, ap_copy);
                 va_end(ap_copy);
@@ -55 +55 @@
 }
 
+char* strmove(char *a, char *b) //strcpy that works well for overlapping strings ("Source and destination overlap")
+{
+        if (a == NULL || b == NULL)
+                return NULL;
+        memmove(a, b, strlen(b) + 1);
+        return a;
+}
+
 string ssprintf(const char* format, ...)
 {
@@ -66 +74 @@
 bool readCompleteFile(const char* filename, vector<char>& data, bool warn_on_missing_file)
 {
-    bool ok=false;
+        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);
@@ -78 +86 @@
                         ok = przeczytane == 1;
                         delete f;
-                        }
                 }
+        }
         else
 #endif
         {
-        MFILE *f = mfopen(filename, FOPEN_READ_BINARY);
-        if (f)
-        {
-                int size=getFileSize(f);
-                data.resize(size);
-                int przeczytane = mfread(&data[0], size, 1, f);
-                mfclose(f);
-                ok = przeczytane == 1;
-        }
+                MFILE *f = mfopen(filename, FOPEN_READ_BINARY);
+                if (f)
+                {
+                        int size = getFileSize(f);
+                        data.resize(size);
+                        int przeczytane = mfread(&data[0], size, 1, f);
+                        mfclose(f);
+                        ok = przeczytane == 1;
+                }
         }
         if (warn_on_missing_file && !ok)