Changeset 529 for cpp/frams

Timestamp:

07/18/16 04:15:22 (8 years ago)

Author:

Maciej Komosinski

Message:

\r can be optionally removed while loading

Location:

cpp/frams/util

Files:

• sstringutils.cpp (modified) (4 diffs)
• sstringutils.h (modified) (1 diff)

cpp/frams/util/sstringutils.cpp

@@ -8 +8 @@
 #include <common/nonstd.h>
 
-int loadSString(const char* filename, SString& s, const char* framsgmodule, const char* error)
+int loadSString(const char* filename, SString& s, const char* framsgmodule, const char* error, bool remove_cr)
 {
         VirtFILE *f;
@@ -14 +14 @@
         if (f = Vfopen(filename, FOPEN_READ_BINARY))
         {
-                loadSString(f, s);
+                loadSString(f, s, remove_cr);
                 ret = 1;
                 delete f;
@@ -23 +23 @@
 }
 
-void loadSString(VirtFILE *f, SString& s)
+void loadSString(VirtFILE *f, SString& s, bool remove_cr)
 {
         char buf[1024];
@@ -32 +32 @@
                 s.append(buf, len);
         }
-        removeCR(s);
+        if (remove_cr)
+                removeCR(s);
 }
 

cpp/frams/util/sstringutils.h

@@ -10 +10 @@
 
 /// return: 1=ok 0=error
-int loadSString(const char* filename, SString& s, const char* framsgmodule = 0, const char* error = 0);
-void loadSString(VirtFILE *f, SString& s);
+int loadSString(const char* filename, SString& s, const char* framsgmodule = 0, const char* error = 0, bool remove_cr=true);
+void loadSString(VirtFILE *f, SString& s, bool remove_cr=true);
 bool loadSStringLine(VirtFILE* f, SString &s);