From 682d16b7d3fa36d133c96670b4c1aae91346bb14 Mon Sep 17 00:00:00 2001 From: John Sully Date: Tue, 17 Mar 2020 17:25:36 -0400 Subject: [PATCH] Special case version 0.0.0 which is equal to any version Former-commit-id: 869d037490b6905674f75a8552898aed72148558 --- src/server.cpp | 11 ++++++++--- src/version.h | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/server.cpp b/src/server.cpp index f59288a3a..bb5f47a80 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -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; @@ -1693,13 +1698,13 @@ VersionCompareResult compareVersion(SymVer *pver) case 2: verThis = symVerThis.build; verOther = pver->build; } - + if (verThis < verOther) return VersionCompareResult::NewerVersion; 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 diff --git a/src/version.h b/src/version.h index 793078590..94c254ac2 100644 --- a/src/version.h +++ b/src/version.h @@ -3,7 +3,7 @@ extern const char *KEYDB_SET_VERSION; // Unlike real version, this can be over enum VersionCompareResult { - EqualVerison, + EqualVersion, OlderVersion, NewerVersion, };