diff --git a/src/cpuinfo_x86.c b/src/cpuinfo_x86.c index dde9a15..c997b7b 100644 --- a/src/cpuinfo_x86.c +++ b/src/cpuinfo_x86.c @@ -64,7 +64,7 @@ Leaf CpuIdEx(uint32_t leaf_id, int ecx) { return leaf; } -uint32_t GetXCR0Eax(void) { return _xgetbv(0); } +uint32_t GetXCR0Eax(void) { return (uint32_t)_xgetbv(0); } #else #error "Unsupported compiler, x86 cpuid requires either GCC, Clang or MSVC." diff --git a/src/filesystem.c b/src/filesystem.c index 25444da..2f7083b 100644 --- a/src/filesystem.c +++ b/src/filesystem.c @@ -16,6 +16,7 @@ #include #include +#include #include #include @@ -24,14 +25,16 @@ #elif defined(_MSC_VER) #include int CpuFeatures_OpenFile(const char* filename) { - return _open(filename, _O_RDONLY); + int fd = -1; + _sopen_s(&fd, filename, _O_RDONLY, _SH_DENYWR, _S_IREAD); + return fd; } void CpuFeatures_CloseFile(int file_descriptor) { _close(file_descriptor); } int CpuFeatures_ReadFile(int file_descriptor, void* buffer, size_t buffer_size) { - return _read(file_descriptor, buffer, buffer_size); + return _read(file_descriptor, buffer, (unsigned int)buffer_size); } #else diff --git a/src/string_view.c b/src/string_view.c index 4f27cbd..856731c 100644 --- a/src/string_view.c +++ b/src/string_view.c @@ -22,7 +22,7 @@ int CpuFeatures_StringView_IndexOfChar(const StringView view, char c) { if (view.ptr && view.size) { const char* const found = (const char*)memchr(view.ptr, c, view.size); if (found) { - return found - view.ptr; + return (int)(found - view.ptr); } } return -1; @@ -38,7 +38,7 @@ int CpuFeatures_StringView_IndexOf(const StringView view, if (found_index < 0) break; remainder = CpuFeatures_StringView_PopFront(remainder, found_index); if (CpuFeatures_StringView_StartsWith(remainder, sub_view)) { - return remainder.ptr - view.ptr; + return (int)(remainder.ptr - view.ptr); } remainder = CpuFeatures_StringView_PopFront(remainder, 1); } diff --git a/src/utils/list_cpu_features.c b/src/utils/list_cpu_features.c index a9ff829..acda5e7 100644 --- a/src/utils/list_cpu_features.c +++ b/src/utils/list_cpu_features.c @@ -136,7 +136,7 @@ static int cmp(const void* p1, const void* p2) { ++count; \ } \ } \ - qsort(ptrs, count, sizeof(char*), cmp); \ + qsort((void*)ptrs, count, sizeof(char*), cmp); \ p.StartField("flags"); \ p.ArrayStart(); \ for (i = 0; i < count; ++i) { \ diff --git a/test/bit_utils_test.cc b/test/bit_utils_test.cc index 8937cbc..9c8c1bb 100644 --- a/test/bit_utils_test.cc +++ b/test/bit_utils_test.cc @@ -22,18 +22,18 @@ namespace { TEST(UtilsTest, IsBitSet) { for (size_t bit_set = 0; bit_set < 32; ++bit_set) { const uint32_t value = 1UL << bit_set; - for (size_t i = 0; i < 32; ++i) { + for (uint32_t i = 0; i < 32; ++i) { EXPECT_EQ(IsBitSet(value, i), i == bit_set); } } // testing 0, all bits should be 0. - for (size_t i = 0; i < 32; ++i) { + for (uint32_t i = 0; i < 32; ++i) { EXPECT_FALSE(IsBitSet(0, i)); } // testing ~0, all bits should be 1. - for (size_t i = 0; i < 32; ++i) { + for (uint32_t i = 0; i < 32; ++i) { EXPECT_TRUE(IsBitSet(-1, i)); } } diff --git a/test/filesystem_for_testing.cc b/test/filesystem_for_testing.cc index 4554c1f..0a11416 100644 --- a/test/filesystem_for_testing.cc +++ b/test/filesystem_for_testing.cc @@ -45,7 +45,7 @@ int FakeFile::Read(int fd, void* buf, size_t count) { memcpy(buf, content_.data() + head_index_, read); head_index_ += read; assert(read < INT_MAX); - return read; + return (int)read; } void FakeFilesystem::Reset() { files_.clear(); } diff --git a/test/filesystem_for_testing.h b/test/filesystem_for_testing.h index ca269e5..7474b5f 100644 --- a/test/filesystem_for_testing.h +++ b/test/filesystem_for_testing.h @@ -50,7 +50,7 @@ class FakeFilesystem { FakeFile* FindFileOrNull(const std::string& filename) const; private: - size_t next_file_descriptor_ = 0; + int next_file_descriptor_ = 0; std::unordered_map> files_; };