Changeset 891 for cpp

Timestamp:

07/22/19 17:11:36 (5 years ago)

Author:

Maciej Komosinski

Message:

Fixed return integer type discrepancy

File:

• cpp/common/virtfile/virtfile.h (modified) (3 diffs)

cpp/common/virtfile/virtfile.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2019  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -109 +109 @@
         bool Vfexists(const char* path);
         VirtDIR *Vopendir(const char* path);
-        virtual VirtDIR *internalopendir(const char* path) {return NULL;}
+        virtual VirtDIR *internalopendir(const char* path) { return NULL; }
         bool Vmkdir(const char* path);
         bool Vmkdirs(const char* path);
         bool Vdirexists(const char* path, bool is_writable);
 
-        class Dir: public VirtDIR
+        class Dir : public VirtDIR
         {
-        ChainFileSystem *first;
-        VirtFileSystem *second;
-        string path;
-        std::set<string> duplicates;
-        VirtDIR *dir;
-          public:
-        Dir(string _path,ChainFileSystem *_first,VirtFileSystem *_second):first(_first),second(_second),path(_path),dir(NULL) {}
-        ~Dir();
-        dirent* Vreaddir();
+                ChainFileSystem *first;
+                VirtFileSystem *second;
+                string path;
+                std::set<string> duplicates;
+                VirtDIR *dir;
+        public:
+                Dir(string _path, ChainFileSystem *_first, VirtFileSystem *_second) :first(_first), second(_second), path(_path), dir(NULL) {}
+                ~Dir();
+                dirent* Vreaddir();
         };
 };
@@ -139 +139 @@
 //required for redefine_stdio.h and for building virtfile.dll, can also be used if someone prefers the standard f-functions instead of explicitly using virtfile objects
 
-DLLEXP int fread(void *ptr, size_t size, size_t nmemb, VirtFILE* f);
-DLLEXP int fwrite(const void *ptr, size_t size, size_t nmemb, VirtFILE* f);
+DLLEXP size_t fread(void *ptr, size_t size, size_t nmemb, VirtFILE* f);
+DLLEXP size_t fwrite(const void *ptr, size_t size, size_t nmemb, VirtFILE* f);
 
 //since we want our own feof(VirtFILE*) function and some systems unfortunately define feof as a macro, we need to #undef it. Same as in virtfile.cpp