fix

srz-zumix · Jul 23, 2022 · 2ff51bd · 2ff51bd
1 parent a7f815d
commit 2ff51bd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/include/internal/iutest_file.hpp b/include/internal/iutest_file.hpp
@@ -283,22 +283,20 @@ class StdioFile : public IFile
     virtual bool OpenImpl(const char* filename, int mode) IUTEST_CXX_OVERRIDE
     {
         Close();
-IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_BEGIN()
         switch( mode )
         {
         case IFile::OpenRead:
-            m_fp = fopen(filename, "rb");
+            m_fp = internal::posix::FileOpen(filename, "rb");
             break;
         case IFile::OpenWrite:
-            m_fp = fopen(filename, "wb");
+            m_fp = internal::posix::FileOpen(filename, "wb");
             break;
         case IFile::OpenAppend:
-            m_fp = fopen(filename, "ab");
+            m_fp = internal::posix::FileOpen(filename, "ab");
             break;
         default:
             break;
         }
-IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_END()
         return m_fp != NULL;
     }
 };

diff --git a/include/internal/iutest_port.hpp b/include/internal/iutest_port.hpp
@@ -109,15 +109,17 @@ inline void Abort() { abort(); }
 inline FILE* FileOpen(const char* filename, const char* mode)
 {
 #if defined(_MSC_VER)
+IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_BEGIN()
     return fopen(filename, mode);
+IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_END()
 #elif defined(_LARGEFILE64_SOURCE)
     return fopen64(filename, mode);
 #else
     return fopen(filename, mode);
 #endif
 }
 
-inline int FileSeek(FILE* fp, size_t pos, int origin)
+inline int FileSeek(FILE* fp, iu_off_t pos, int origin)
 {
 #if defined(_MSC_VER)
     return _fseeki64(fp, pos, origin);
@@ -130,16 +132,16 @@ inline int FileSeek(FILE* fp, size_t pos, int origin)
 #endif
 }
 
-inline ssize_t FileTell(FILE* fp)
+inline iu_off_t FileTell(FILE* fp)
 {
 #if defined(_MSC_VER)
-    return static_cast<ssize_t>(_ftelli64(fp));
+    return static_cast<iu_off_t>(_ftelli64(fp));
 #elif defined(_LARGEFILE64_SOURCE)
-    return static_cast<ssize_t>(ftello64(fp));
+    return static_cast<iu_off_t>(ftello64(fp));
 #elif IUTEST_HAS_LARGEFILE_API
-    return static_cast<ssize_t>(ftello(fp));
+    return static_cast<iu_off_t>(ftello(fp));
 #else
-    return static_cast<ssize_t>(ftell(fp));
+    return static_cast<iu_off_t>(ftell(fp));
 #endif
 }
 

diff --git a/include/iutest_defs.hpp b/include/iutest_defs.hpp
@@ -504,9 +504,9 @@ typedef detail::type_fit_t<8>::Int  Int64;  //!< 64 bit 符号付き整数型
 typedef detail::type_fit_t<8>::UInt UInt64; //!< 64 bit 符号なし整数型
 
 #if IUTEST_HAS_CXX11 && IUTEST_HAS_CXX_HDR_CSTDINT
-typedef ::std::uintmax_t    iu_off_t;
+typedef ::std::intmax_t     iu_off_t;
 #else
-typedef UInt64              iu_off_t;
+typedef Int64               iu_off_t;
 #endif
 
 #if IUTEST_HAS_CXX11 && IUTEST_HAS_CXX_HDR_CSTDINT