Changeset 888 for cpp/common/virtfile/virtfile.cpp

Timestamp:

07/22/19 01:15:38 (5 years ago)

Author:

Maciej Komosinski

Message:

More explicit code to fix compiler warnings

File:

• cpp/common/virtfile/virtfile.cpp (modified) (4 diffs)

cpp/common/virtfile/virtfile.cpp

@@ -64 +64 @@
 {
         string s = ssprintf_va(format, args);
-        return Vwrite(s.c_str(), 1, s.size());
+        return (int)Vwrite(s.c_str(), 1, s.size());
 }
 
@@ -78 +78 @@
 int VirtFILE::getSize()
 {
-        int saved_pos = Vtell();
+        auto saved_pos = Vtell();
         Vseek(0, SEEK_END);
-        int size = Vtell();
+        int size = (int)Vtell();
         Vseek(saved_pos, SEEK_SET);
         return size;
@@ -104 +104 @@
 
 
-int fread(void *ptr, size_t size, size_t nmemb, VirtFILE* f) { return f->Vread(ptr, size, nmemb); }
-int fwrite(const void *ptr, size_t size, size_t nmemb, VirtFILE* f) { return f->Vwrite(ptr, size, nmemb); }
+size_t fread(void *ptr, size_t size, size_t nmemb, VirtFILE* f) { return f->Vread(ptr, size, nmemb); }
+size_t fwrite(const void *ptr, size_t size, size_t nmemb, VirtFILE* f) { return f->Vwrite(ptr, size, nmemb); }
 
 
@@ -132 +132 @@
 int fgetc(VirtFILE* f) { return f->Vgetc(); }
 int fseek(VirtFILE* f, long offset, int whence) { return f->Vseek(offset, whence); }
-int ftell(VirtFILE* f) { return f->Vtell(); }
+int ftell(VirtFILE* f) { return (int)f->Vtell(); }
 void rewind(VirtFILE* f) { f->Vrewind(); }
 int fflush(VirtFILE* f) { return f->Vflush(); }