GithubStar/MMKV
1
0
Fork 0
mirror of https://github.com/Tencent/MMKV.git synced 2026-10-17 04:30:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix some type warning & use relate path in core.vcproj

Browse Source
This commit is contained in:
guoling
2019-12-18 12:31:47 +08:00
parent 36df7b56c8
commit 944b9c352f
7 changed files with 211 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/CodedOutputData.cpp
Regular → Executable
+1 -1
View File
@@ -83,7 +83,7 @@ void CodedOutputData::writeData(const MMBuffer &value) {
this->writeRawData(value);
}
int32_t CodedOutputData::spaceLeft() {
size_t CodedOutputData::spaceLeft() {
return int32_t(m_size - m_position);
}
Core/CodedOutputData.h
Regular → Executable
+2 -2
View File
@@ -30,12 +30,12 @@ namespace mmkv {
class CodedOutputData {
uint8_t *const m_ptr;
size_t m_size;
int32_t m_position;
size_t m_position;
public:
CodedOutputData(void *ptr, size_t len);
int32_t spaceLeft();
size_t spaceLeft();
void seek(size_t addedSize);
Core/MMKV.cpp
Regular → Executable
+8 -8
View File
@@ -42,7 +42,7 @@ unordered_map<std::string, MMKV *> *g_instanceDic;
ThreadLock g_instanceLock;
static MMKV_PATH_TYPE g_rootDir;
static mmkv::ErrorHandler g_errorHandler;
int mmkv::DEFAULT_MMAP_SIZE;
size_t mmkv::DEFAULT_MMAP_SIZE;
constexpr auto DEFAULT_MMAP_ID = "mmkv.default";
#ifndef MMKV_WIN32
@@ -885,7 +885,7 @@ bool MMKV::isFileValid() {
return m_file.isFileValid();
}
#pragma mark - crc
// crc
// assuming m_file is valid
bool MMKV::checkFileCRCValid(size_t acutalSize, uint32_t crcDigest) {
@@ -923,7 +923,7 @@ void MMKV::updateCRCDigest(const uint8_t *ptr, size_t length) {
writeActualSize(m_actualSize, m_crcDigest, nullptr, KeepSequence);
}
#pragma mark - set & get
// set & get
bool MMKV::set(const char *value, const string &key) {
if (!value) {
@@ -1246,7 +1246,7 @@ int32_t MMKV::writeValueToBuffer(const string &key, void *ptr, int32_t size) {
return length;
}
} else {
if (data.length() <= size) {
if (static_cast<int32_t>(data.length()) <= size) {
memcpy(ptr, data.getPtr(), data.length());
return static_cast<int32_t>(data.length());
}
@@ -1257,7 +1257,7 @@ int32_t MMKV::writeValueToBuffer(const string &key, void *ptr, int32_t size) {
return -1;
}
#pragma mark - enumerate
// enumerate
bool MMKV::containsKey(const string &key) {
SCOPEDLOCK(m_lock);
@@ -1318,7 +1318,7 @@ void MMKV::removeValuesForKeys(const vector<string> &arrKeys) {
fullWriteback();
}
#pragma mark - file
// file
void MMKV::sync(SyncFlag flag) {
SCOPEDLOCK(m_lock);
@@ -1434,8 +1434,8 @@ static MMKV_PATH_TYPE encodeFilePath(const string &mmapID) {
const char *specialCharacters = "\\/:*?\"<>|";
string encodedID;
bool hasSpecialCharacter = false;
for (int i = 0; i < mmapID.size(); i++) {
if (strchr(specialCharacters, mmapID[i]) != nullptr) {
for (auto ch : mmapID) {
if (strchr(specialCharacters, ch) != nullptr) {
encodedID = md5(mmapID);
hasSpecialCharacter = true;
break;
Core/MMKVPredef.h
Regular → Executable
+1 -1
View File
@@ -95,7 +95,7 @@ typedef MMKVRecoverStrategic (*ErrorHandler)(const std::string &mmapID, MMKVErro
typedef void (*ContentChangeHandler)(const std::string &mmapID);
extern int DEFAULT_MMAP_SIZE;
extern size_t DEFAULT_MMAP_SIZE;
} // namespace mmkv
Core/core.vcxproj
+66 -247
View File
File diff suppressed because one or more lines are too long
Core/core.vcxproj.filters
+133 -142
View File
@@ -1,147 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="Z:\mmkv\Core\MMKV.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Z:\mmkv\Core\MMKV_Android.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Z:\mmkv\Core\MMKVLog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Z:\mmkv\Core\MMKVLog_Android.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Z:\mmkv\Core\CodedInputData.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Z:\mmkv\Core\CodedOutputData.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Z:\mmkv\Core\PBUtility.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Z:\mmkv\Core\MiniPBCoder.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Z:\mmkv\Core\MMBuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Z:\mmkv\Core\InterProcessLock.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Z:\mmkv\Core\MemoryFile.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Z:\mmkv\Core\MemoryFile_Android.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Z:\mmkv\Core\ThreadLock.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Z:\mmkv\Core\aes\AESCrypt.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Z:\mmkv\Core\aes\openssl\aes_cfb.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Z:\mmkv\Core\aes\openssl\aes_core.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Z:\mmkv\Core\aes\openssl\cfb128.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Z:\mmkv\Core\aes\openssl\md5_dgst.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Z:\mmkv\Core\aes\openssl\md5_one.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Z:\mmkv\Core\crc32\zlib\crc32.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MemoryFile_Win32.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Z:\mmkv\Core\MMKV.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\MMKVLog.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\CodedInputData.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\CodedOutputData.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\PBUtility.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\MiniPBCoder.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\MMBuffer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\InterProcessLock.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\MemoryFile.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\ThreadLock.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\MMKVMetaInfo.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\aes\AESCrypt.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\aes\openssl\aes.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\aes\openssl\aes_locl.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\aes\openssl\modes.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\aes\openssl\opensslconf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\aes\openssl\md5_locl.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\aes\openssl\md5.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\aes\openssl\md32_common.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\crc32\Checksum.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\crc32\zlib\zconf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\crc32\zlib\zutil.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\crc32\zlib\crc32.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Z:\mmkv\Core\MMKVPredef.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="Z:\mmkv\Core\CMakeLists.txt" />
</ItemGroup>
<ItemGroup>
<Filter Include="Header Files">
<UniqueIdentifier>{A23FB4D7-B12B-3111-88E9-80ECCF93DBA8}</UniqueIdentifier>
@@ -150,4 +8,137 @@
<UniqueIdentifier>{047F57F7-8EBB-3570-BBF5-21BCA0934FD5}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="CodedInputData.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="CodedOutputData.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="aes\openssl\aes_cfb.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="aes\openssl\aes_core.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="aes\AESCrypt.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="aes\openssl\cfb128.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="crc32\zlib\crc32.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="InterProcessLock.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="aes\openssl\md5_dgst.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="aes\openssl\md5_one.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MemoryFile_Win32.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MMBuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MMKV.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MMKVLog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ThreadLock.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="MiniPBCoder.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="PBUtility.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="CodedInputData.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="CodedOutputData.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="InterProcessLock.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MemoryFile.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MiniPBCoder.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MMBuffer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MMKV.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MMKVLog.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="crc32\zlib\crc32.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="crc32\zlib\zconf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="crc32\zlib\zutil.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="aes\AESCrypt.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="aes\openssl\aes.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="aes\openssl\aes_locl.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="aes\openssl\md5.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="aes\openssl\md5_locl.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="aes\openssl\md32_common.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="aes\openssl\modes.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="aes\openssl\opensslconf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="crc32\Checksum.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MMKVMetaInfo.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="MMKVPredef.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PBEncodeItem.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PBUtility.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ScopedLock.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ThreadLock.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
Win32/Win32.sln
-26
View File
@@ -20,58 +20,32 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
MinSizeRel|x64 = MinSizeRel|x64
MinSizeRel|x86 = MinSizeRel|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
RelWithDebInfo|x64 = RelWithDebInfo|x64
RelWithDebInfo|x86 = RelWithDebInfo|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{532303C4-38D9-45D3-B925-18056C66CD01}.Debug|x64.ActiveCfg = Debug|x64
{532303C4-38D9-45D3-B925-18056C66CD01}.Debug|x64.Build.0 = Debug|x64
{532303C4-38D9-45D3-B925-18056C66CD01}.Debug|x86.ActiveCfg = Debug|Win32
{532303C4-38D9-45D3-B925-18056C66CD01}.Debug|x86.Build.0 = Debug|Win32
{532303C4-38D9-45D3-B925-18056C66CD01}.MinSizeRel|x64.ActiveCfg = Release|x64
{532303C4-38D9-45D3-B925-18056C66CD01}.MinSizeRel|x64.Build.0 = Release|x64
{532303C4-38D9-45D3-B925-18056C66CD01}.MinSizeRel|x86.ActiveCfg = Release|Win32
{532303C4-38D9-45D3-B925-18056C66CD01}.MinSizeRel|x86.Build.0 = Release|Win32
{532303C4-38D9-45D3-B925-18056C66CD01}.Release|x64.ActiveCfg = Release|x64
{532303C4-38D9-45D3-B925-18056C66CD01}.Release|x64.Build.0 = Release|x64
{532303C4-38D9-45D3-B925-18056C66CD01}.Release|x86.ActiveCfg = Release|Win32
{532303C4-38D9-45D3-B925-18056C66CD01}.Release|x86.Build.0 = Release|Win32
{532303C4-38D9-45D3-B925-18056C66CD01}.RelWithDebInfo|x64.ActiveCfg = Release|x64
{532303C4-38D9-45D3-B925-18056C66CD01}.RelWithDebInfo|x64.Build.0 = Release|x64
{532303C4-38D9-45D3-B925-18056C66CD01}.RelWithDebInfo|x86.ActiveCfg = Release|Win32
{532303C4-38D9-45D3-B925-18056C66CD01}.RelWithDebInfo|x86.Build.0 = Release|Win32
{86D6C605-81F3-407B-A766-690EDF4CD346}.Debug|x64.ActiveCfg = Debug|x64
{86D6C605-81F3-407B-A766-690EDF4CD346}.Debug|x64.Build.0 = Debug|x64
{86D6C605-81F3-407B-A766-690EDF4CD346}.Debug|x86.ActiveCfg = Debug|Win32
{86D6C605-81F3-407B-A766-690EDF4CD346}.Debug|x86.Build.0 = Debug|Win32
{86D6C605-81F3-407B-A766-690EDF4CD346}.MinSizeRel|x64.ActiveCfg = Release|x64
{86D6C605-81F3-407B-A766-690EDF4CD346}.MinSizeRel|x64.Build.0 = Release|x64
{86D6C605-81F3-407B-A766-690EDF4CD346}.MinSizeRel|x86.ActiveCfg = Release|Win32
{86D6C605-81F3-407B-A766-690EDF4CD346}.MinSizeRel|x86.Build.0 = Release|Win32
{86D6C605-81F3-407B-A766-690EDF4CD346}.Release|x64.ActiveCfg = Release|x64
{86D6C605-81F3-407B-A766-690EDF4CD346}.Release|x64.Build.0 = Release|x64
{86D6C605-81F3-407B-A766-690EDF4CD346}.Release|x86.ActiveCfg = Release|Win32
{86D6C605-81F3-407B-A766-690EDF4CD346}.Release|x86.Build.0 = Release|Win32
{86D6C605-81F3-407B-A766-690EDF4CD346}.RelWithDebInfo|x64.ActiveCfg = Release|x64
{86D6C605-81F3-407B-A766-690EDF4CD346}.RelWithDebInfo|x64.Build.0 = Release|x64
{86D6C605-81F3-407B-A766-690EDF4CD346}.RelWithDebInfo|x86.ActiveCfg = Release|Win32
{86D6C605-81F3-407B-A766-690EDF4CD346}.RelWithDebInfo|x86.Build.0 = Release|Win32
{32CD39C9-37B5-3D38-A3D9-45E13F4AF9C5}.Debug|x64.ActiveCfg = Debug|Win32
{32CD39C9-37B5-3D38-A3D9-45E13F4AF9C5}.Debug|x86.ActiveCfg = Debug|Win32
{32CD39C9-37B5-3D38-A3D9-45E13F4AF9C5}.Debug|x86.Build.0 = Debug|Win32
{32CD39C9-37B5-3D38-A3D9-45E13F4AF9C5}.MinSizeRel|x64.ActiveCfg = MinSizeRel|Win32
{32CD39C9-37B5-3D38-A3D9-45E13F4AF9C5}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Win32
{32CD39C9-37B5-3D38-A3D9-45E13F4AF9C5}.MinSizeRel|x86.Build.0 = MinSizeRel|Win32
{32CD39C9-37B5-3D38-A3D9-45E13F4AF9C5}.Release|x64.ActiveCfg = Release|Win32
{32CD39C9-37B5-3D38-A3D9-45E13F4AF9C5}.Release|x86.ActiveCfg = Release|Win32
{32CD39C9-37B5-3D38-A3D9-45E13F4AF9C5}.Release|x86.Build.0 = Release|Win32
{32CD39C9-37B5-3D38-A3D9-45E13F4AF9C5}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|Win32
{32CD39C9-37B5-3D38-A3D9-45E13F4AF9C5}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Win32
{32CD39C9-37B5-3D38-A3D9-45E13F4AF9C5}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE