From 44c28097332b0a137c4674bcfd8d243b593b3cee Mon Sep 17 00:00:00 2001 From: Thulinma Date: Thu, 18 Aug 2022 02:44:11 +0200 Subject: [PATCH] Decreased verbosity of harmless data offset warnings, increased verbosity of harmful ones --- src/input/input.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/input/input.cpp b/src/input/input.cpp index 942a55f8..0a062392 100644 --- a/src/input/input.cpp +++ b/src/input/input.cpp @@ -1382,10 +1382,12 @@ namespace Mist{ size_t currPos = tPages.getInt("avail", pageIdx); if (currPos){ size_t keySize = keys.getSize(keyNum); - if (currPos-prevPos != keySize){ - INFO_MSG("Key %" PRIu32 " was %zu bytes but should've been %zu bytes! (differs %d)", keyNum, currPos-prevPos, keySize, (int)(currPos-prevPos-keySize)); - }else{ + if (currPos-prevPos == keySize){ VERYHIGH_MSG("Key %" PRIu32 " was %zu bytes", keyNum, currPos-prevPos); + }else if (currPos-prevPos > keySize){ + FAIL_MSG("Key %" PRIu32 " was %zu bytes but should've been %zu bytes! (differs %d)", keyNum, currPos-prevPos, keySize, (int)(currPos-prevPos-keySize)); + }else{ + MEDIUM_MSG("Key %" PRIu32 " was %zu bytes but should've been %zu bytes! (differs %d)", keyNum, currPos-prevPos, keySize, (int)(currPos-prevPos-keySize)); } ++keyNum; prevPos = currPos; @@ -1412,8 +1414,12 @@ namespace Mist{ size_t currPos = tPages.getInt("avail", pageIdx); if (currPos){ size_t keySize = keys.getSize(keyNum); - if (currPos-prevPos != keySize){ - INFO_MSG("Key %" PRIu32 " was %zu bytes but should've been %zu bytes! (differs %d)", keyNum, currPos-prevPos, keySize, (int)(currPos-prevPos-keySize)); + if (currPos-prevPos == keySize){ + VERYHIGH_MSG("Key %" PRIu32 " was %zu bytes", keyNum, currPos-prevPos); + }else if (currPos-prevPos > keySize){ + FAIL_MSG("Key %" PRIu32 " was %zu bytes but should've been %zu bytes! (differs %d)", keyNum, currPos-prevPos, keySize, (int)(currPos-prevPos-keySize)); + }else{ + MEDIUM_MSG("Key %" PRIu32 " was %zu bytes but should've been %zu bytes! (differs %d)", keyNum, currPos-prevPos, keySize, (int)(currPos-prevPos-keySize)); } ++keyNum; prevPos = currPos;