gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'keydbpro' into PRO_RELEASE_6

Browse Source 
Former-commit-id: 23c3316c10f2771bc26e50698b48934ec7549bcd
This commit is contained in:
John Sully 2020-03-17 17:47:55 -04:00
commit b0dceb9410
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/server.cpp
View File

@ -1679,6 +1679,11 @@ SymVer parseVersion(const char *version)
VersionCompareResult compareVersion(SymVer *pver)
{
SymVer symVerThis = parseVersion(KEYDB_REAL_VERSION);
// Special case, 0.0.0 is equal to any version
if ((symVerThis.major == 0 && symVerThis.minor == 0 && symVerThis.build == 0)
|| (pver->major == 0 && pver->minor == 0 && pver->build == 0))
return VersionCompareResult::EqualVersion;
for (int iver = 0; iver < 3; ++iver)
{
long verThis, verOther;
@ -1699,7 +1704,7 @@ VersionCompareResult compareVersion(SymVer *pver)
if (verThis > verOther)
return VersionCompareResult::OlderVersion;
}
return VersionCompareResult::EqualVerison;
return VersionCompareResult::EqualVersion;
}
/* This function is used in order to track clients using the biggest amount
@ -5457,7 +5462,7 @@ int main(int argc, char **argv) {
SymVer version;
version = parseVersion(KEYDB_REAL_VERSION);
serverAssert(version.major >= 0 && version.minor >= 0 && version.build >= 0);
serverAssert(compareVersion(&version) == VersionCompareResult::EqualVerison);
serverAssert(compareVersion(&version) == VersionCompareResult::EqualVersion);
}
#ifdef USE_MEMKIND

2
src/version.h
View File

@ -3,7 +3,7 @@ extern const char *KEYDB_SET_VERSION; // Unlike real version, this can be over
enum VersionCompareResult
{
EqualVerison,
EqualVersion,
OlderVersion,
NewerVersion,
};