From 299c3b4b865251b895d8772e2ac0eba3a55e1e32 Mon Sep 17 00:00:00 2001 From: Avi Date: Thu, 27 Oct 2022 12:48:30 +1000 Subject: [PATCH] Fix #1518, Rename misnomer function name CFE_TBLNotifyTblUsersOfUpdate() --- modules/tbl/fsw/src/cfe_tbl_api.c | 2 +- modules/tbl/fsw/src/cfe_tbl_internal.c | 8 ++++---- modules/tbl/fsw/src/cfe_tbl_internal.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/tbl/fsw/src/cfe_tbl_api.c b/modules/tbl/fsw/src/cfe_tbl_api.c index 36e08f068..0ec7cc2ec 100644 --- a/modules/tbl/fsw/src/cfe_tbl_api.c +++ b/modules/tbl/fsw/src/cfe_tbl_api.c @@ -560,7 +560,7 @@ CFE_Status_t CFE_TBL_Load(CFE_TBL_Handle_t TblHandle, CFE_TBL_SrcEnum_t SrcType, strncpy(RegRecPtr->LastFileLoaded, WorkingBufferPtr->DataSource, sizeof(RegRecPtr->LastFileLoaded) - 1); RegRecPtr->LastFileLoaded[sizeof(RegRecPtr->LastFileLoaded) - 1] = '\0'; - CFE_TBL_NotifyTblUsersOfUpdate(RegRecPtr); + CFE_TBL_MarkTblAsUpdated(RegRecPtr); /* If the table is a critical table, update the appropriate CDS with the new data */ if (RegRecPtr->CriticalTable == true) diff --git a/modules/tbl/fsw/src/cfe_tbl_internal.c b/modules/tbl/fsw/src/cfe_tbl_internal.c index 4ab8ef482..78057d6a9 100644 --- a/modules/tbl/fsw/src/cfe_tbl_internal.c +++ b/modules/tbl/fsw/src/cfe_tbl_internal.c @@ -641,7 +641,7 @@ int32 CFE_TBL_UpdateInternal(CFE_TBL_Handle_t TblHandle, CFE_TBL_RegistryRec_t * sizeof(RegRecPtr->LastFileLoaded) - 1); RegRecPtr->LastFileLoaded[sizeof(RegRecPtr->LastFileLoaded) - 1] = '\0'; - CFE_TBL_NotifyTblUsersOfUpdate(RegRecPtr); + CFE_TBL_MarkTblAsUpdated(RegRecPtr); /* If the table is a critical table, update the appropriate CDS with the new data */ if (RegRecPtr->CriticalTable == true) @@ -687,7 +687,7 @@ int32 CFE_TBL_UpdateInternal(CFE_TBL_Handle_t TblHandle, CFE_TBL_RegistryRec_t * /* Free the working buffer */ CFE_TBL_Global.LoadBuffs[RegRecPtr->LoadInProgress].Taken = false; - CFE_TBL_NotifyTblUsersOfUpdate(RegRecPtr); + CFE_TBL_MarkTblAsUpdated(RegRecPtr); /* If the table is a critical table, update the appropriate CDS with the new data */ if (RegRecPtr->CriticalTable == true) @@ -718,7 +718,7 @@ static void CFE_TBL_SetUpdatedHelper(CFE_TBL_AccessDescriptor_t *AccDescPtr, voi * See description in header file for argument/return detail * *-----------------------------------------------------------------*/ -void CFE_TBL_NotifyTblUsersOfUpdate(CFE_TBL_RegistryRec_t *RegRecPtr) +void CFE_TBL_MarkTblAsUpdated(CFE_TBL_RegistryRec_t *RegRecPtr) { /* Reset Load in Progress Values */ RegRecPtr->LoadInProgress = CFE_TBL_NO_LOAD_IN_PROGRESS; @@ -1331,7 +1331,7 @@ CFE_Status_t CFE_TBL_RestoreTableDataFromCDS(CFE_TBL_RegistryRec_t *RegRecPtr, c CFE_ES_CalculateCRC(WorkingBufferPtr->BufferPtr, RegRecPtr->Size, 0, CFE_MISSION_ES_DEFAULT_CRC); /* Make sure everyone who sees the table knows that it has been updated */ - CFE_TBL_NotifyTblUsersOfUpdate(RegRecPtr); + CFE_TBL_MarkTblAsUpdated(RegRecPtr); /* Make sure the caller realizes the contents have been initialized */ Status = CFE_TBL_INFO_RECOVERED_TBL; diff --git a/modules/tbl/fsw/src/cfe_tbl_internal.h b/modules/tbl/fsw/src/cfe_tbl_internal.h index 76bc5bc3f..0e095bd7b 100644 --- a/modules/tbl/fsw/src/cfe_tbl_internal.h +++ b/modules/tbl/fsw/src/cfe_tbl_internal.h @@ -247,7 +247,7 @@ int32 CFE_TBL_UpdateInternal(CFE_TBL_Handle_t TblHandle, CFE_TBL_RegistryRec_t * ** ** \param[in] RegRecPtr Pointer to Table Registry Entry for table to be updated */ -void CFE_TBL_NotifyTblUsersOfUpdate(CFE_TBL_RegistryRec_t *RegRecPtr); +void CFE_TBL_MarkTblAsUpdated(CFE_TBL_RegistryRec_t *RegRecPtr); /*---------------------------------------------------------------------------------------*/ /**