Changeset 888

Timestamp:

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

Author:

Maciej Komosinski

Message:

More explicit code to fix compiler warnings

Location:

cpp/common

Files:

• nonstd_stdio.cpp (modified) (1 diff)
• util-file.cpp (modified) (4 diffs)
• util-stl.h (modified) (2 diffs)
• virtfile/virtfile.cpp (modified) (4 diffs)

cpp/common/nonstd_stdio.cpp

@@ -119 +119 @@
 int getFileSize(MFILE *f)
 {
-        int saved_pos = mftell(f);
+        int saved_pos = (int)mftell(f);
         mfseek(f, 0, SEEK_END);
-        int size = mftell(f);
+        int size = (int)mftell(f);
         mfseek(f, saved_pos, SEEK_SET);
         return size;

cpp/common/util-file.cpp

@@ -22 +22 @@
                         int size=f->getSize();
                         data.resize(size);
-                        int przeczytane = f->Vread(&data[0], size, 1);
-                        ok = przeczytane == 1;
+                        int przeczytane = (int)f->Vread(&data[0], size, 1);
+                        ok = (przeczytane == 1);
                         delete f;
                 }
@@ -35 +35 @@
                         int size = getFileSize(f);
                         data.resize(size);
-                        int przeczytane = mfread(&data[0], size, 1, f);
+                        int przeczytane = (int)mfread(&data[0], size, 1, f);
                         mfclose(f);
-                        ok = przeczytane == 1;
+                        ok = (przeczytane == 1);
                 }
         }
@@ -63 +63 @@
         if (f)
         {
-                int zapisane = f->Vwrite(text.c_str(), text.length(), 1);
+                int zapisane = (int)f->Vwrite(text.c_str(), text.length(), 1);
                 delete f;
-                ok &= zapisane == 1;
+                ok &= (zapisane == 1);
         }
 #else
@@ -72 +72 @@
         if (f)
         {
-                int zapisane = mfwrite(text.c_str(), text.length(), 1, f);
+                int zapisane = (int)mfwrite(text.c_str(), text.length(), 1, f);
                 mfclose(f);
-                ok &= zapisane == 1;
+                ok &= (zapisane == 1);
         }
 #endif

cpp/common/util-stl.h

@@ -32 +32 @@
         typename vector<T>::iterator it = find(v.begin(), v.end(), e);
         if (it != v.end())
-                return &*it - &v.front();
+                return int(&*it - &v.front());
         return -1;
 }
@@ -42 +42 @@
         ~DeletingVector()
         {
-                for (int i = vector.size() - 1; i >= 0; i--)
+                for (int i = (int)vector.size() - 1; i >= 0; i--)
                         delete vector[i];
         }

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(); }