From bd65ac115e7dd554ff032d13a6c8d4623088f63e Mon Sep 17 00:00:00 2001 From: RavePossum Date: Sun, 31 Mar 2024 23:53:29 -0400 Subject: [PATCH] rename check info->valid --- include/savedata.h | 2 +- src/savedata.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/savedata.h b/include/savedata.h index ccb98119d2..3ed47aec01 100644 --- a/include/savedata.h +++ b/include/savedata.h @@ -63,7 +63,7 @@ typedef struct SaveData { } SaveData; typedef struct SaveCheckInfo { - BOOL isValid; + BOOL valid; u32 globalCounter; u32 blockCounter; } SaveCheckInfo; diff --git a/src/savedata.c b/src/savedata.c index 0aac86e54c..d5feaab399 100644 --- a/src/savedata.c +++ b/src/savedata.c @@ -288,7 +288,7 @@ void SaveData_SaveStateCancel (SaveData *saveData) static void SaveData_CheckInfoInit (SaveCheckInfo *checkInfo) { - checkInfo->isValid = FALSE; + checkInfo->valid = FALSE; checkInfo->globalCounter = 0; checkInfo->blockCounter = 0; } @@ -360,7 +360,7 @@ static void SaveBlockFooter_CheckInfo (SaveCheckInfo *checkInfo, SaveData *saveD { SaveBlockFooter *footer = SaveBlockFooter_Ptr(saveData, bodyAddress, blockID); - checkInfo->isValid = SaveBlockFooter_Validate(saveData, bodyAddress, blockID); + checkInfo->valid = SaveBlockFooter_Validate(saveData, bodyAddress, blockID); checkInfo->globalCounter = footer->saveCounter; checkInfo->blockCounter = footer->blockCounter; } @@ -399,7 +399,7 @@ static int SaveCheckInfo_CompareSectors (const SaveCheckInfo *checkInfo1, const int globalDiff = SaveCheckInfo_CompareCounters(checkInfo1->globalCounter, checkInfo2->globalCounter); int blockDiff = SaveCheckInfo_CompareCounters(checkInfo1->blockCounter, checkInfo2->blockCounter); - if (checkInfo1->isValid && checkInfo2->isValid) { + if (checkInfo1->valid && checkInfo2->valid) { if (globalDiff > 0) { GF_ASSERT(blockDiff > 0); *currentSector = SECTOR_ID_PRIMARY; @@ -421,11 +421,11 @@ static int SaveCheckInfo_CompareSectors (const SaveCheckInfo *checkInfo1, const return SECTOR_RESULT_VALID; - } else if (checkInfo1->isValid && !checkInfo2->isValid) { + } else if (checkInfo1->valid && !checkInfo2->valid) { *currentSector = SECTOR_ID_PRIMARY; *staleSector = SECTOR_ID_ERROR; return SECTOR_RESULT_PARTIAL_VALID; - } else if (!checkInfo1->isValid && checkInfo2->isValid) { + } else if (!checkInfo1->valid && checkInfo2->valid) { *currentSector = SECTOR_ID_BACKUP; *staleSector = SECTOR_ID_ERROR; return SECTOR_RESULT_PARTIAL_VALID;