Changeset 382 for cpp/common/virtfile/stringfile.cpp

Timestamp:

05/22/15 04:15:14 (8 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)

File:

• cpp/common/virtfile/stringfile.cpp (modified) (5 diffs)

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;