Changeset 382 for cpp/common

Timestamp:

05/22/15 04:15:14 (10 years ago)

Author:

sz

Message:

Moving frams/virtfile to common/virtfile:

• file references updated (includes, makefile)
• common/virtfile can no longer use the Framsticks specific SString (using std::string instead)

Location:

cpp/common

Files:

• stl-util.cpp (modified) (1 diff)
• virtfile/stringfile.cpp (modified) (5 diffs)
• virtfile/stringfile.h (modified) (2 diffs)

cpp/common/stl-util.cpp

@@ -12 +12 @@
 #include <assert.h>
 #ifdef USE_VIRTFILE
-#include <frams/virtfile/virtfile.h>
+#include <common/virtfile/virtfile.h>
 #endif
 #ifdef __BORLANDC__

cpp/common/virtfile/stringfile.cpp

@@ -9 +9 @@
 size_t StringFILE::Vread(void *ptr, size_t size, size_t nmemb)
 {
-        int have = (int)(str.len() - pos);
+        int have = int(str.size()) - pos;
         if (have <= 0) return 0;
         int need = (int)(size*nmemb);
@@ -20 +20 @@
 int StringFILE::Vgetc()
 {
-        if (pos >= str.len()) //...i znowu byl bug roku! :O
+        if (pos >= int(str.size()))
                 return EOF;
         else
@@ -28 +28 @@
 char *StringFILE::Vgets(char *s, int size)
 {
-        int have = str.len() - (int)pos;
+        int have = int(str.size()) - pos;
         if (have <= 0) return 0;
         if (size < 0) size = 0;
@@ -49 +49 @@
         case SEEK_SET: pos = offset; break;
         case SEEK_CUR: pos += offset; break;
-        case SEEK_END: pos = str.len() - offset; break;
+        case SEEK_END: pos = int(str.size()) - offset; break;
         default: return EINVAL;
         }
-        if (pos < 0) pos = 0; else if (pos>str.len()) pos = str.len();
+        if (pos < 0) pos = 0; else if (pos > int(str.size())) pos = int(str.size());
         return 0;
 }
@@ -67 +67 @@
         if ((*mode == 'r') && isStringPath(path))
         {
-                return new StringFILE2(SString(path + sizeof(PREFIX) - 1));
+                return new StringFILE2(string(path + sizeof(PREFIX) - 1));
         }
         return (chain != NULL) ? chain->Vfopen(path, mode) : NULL;

cpp/common/virtfile/stringfile.h

@@ -7 +7 @@
 
 #include "virtfile.h"
-#include <frams/util/sstring.h>
+#include <common/nonstd_stl.h>
+#include <string.h>
 
 class StringFILE : public VirtFILE
 {
 protected:
-        SString& str;
-        long pos;
+        string& str;
+        int pos;
 public:
-        StringFILE(SString& s): VirtFILE(""), str(s), pos(0) {}
+        StringFILE(string& s): VirtFILE(""), str(s), pos(0) {}
         size_t Vread(void *ptr, size_t size, size_t nmemb);
         size_t Vwrite(const void *ptr, size_t size, size_t nmemb) { str.append((const char*)ptr, (int)(size*nmemb)); return size*nmemb; }
-        int Veof() { return pos >= str.len(); }
+        int Veof() { return pos >= int(str.size()); }
         int Vputc(int c) { str += (char)c; return c; }
         int Vputs(const char *s) { str.append(s, (int)strlen(s)); return 0; }
@@ -31 +32 @@
 class StringFILE2 : public StringFILE
 {
-        SString string;
+        string str;
 public:
-        StringFILE2(const SString& s) :StringFILE(string), string(s) {}
-        StringFILE2() :StringFILE(string) {}
-        const SString& getString() { return string; }
+        StringFILE2(const string& s) :StringFILE(str), str(s) {}
+        StringFILE2() :StringFILE(str) {}
+        const string& getString() { return str; }
 };