Changeset 247 for cpp/frams/virtfile/stringfile.cpp

Timestamp:

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

Author:

Maciej Komosinski

Message:

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

File:

• cpp/frams/virtfile/stringfile.cpp (modified) (2 diffs)

cpp/frams/virtfile/stringfile.cpp

@@ -7 +7 @@
 #include <errno.h> //EINVAL
 
-int StringFILE::Vread(void *ptr, size_t size, size_t nmemb)
+size_t StringFILE::Vread(void *ptr, size_t size, size_t nmemb)
 {
-int have=str.len()-pos;
+int have=(int)(str.len()-pos);
 if (have<=0) return 0;
-int need=size*nmemb;
-if (need>have) {nmemb=have/size; need=size*nmemb;}
+int need=(int)(size*nmemb);
+if (need>have) {nmemb=have/size; need=(int)(size*nmemb);}
 memcpy(ptr,((const char*)str)+pos,need);
 pos+=need;
@@ -23 +23 @@
         return EOF;
 else
-        return str[pos++];
+        return str.operator[]((int)pos++);
 }
 
 char *StringFILE::Vgets(char *s, int size)
 {
-int have=str.len()-pos;
+int have=str.len()-(int)pos;
 if (have<=0) return 0;
 if (size<0) size=0;