diff --git a/modules/tbl/fsw/src/cfe_tbl_api.c b/modules/tbl/fsw/src/cfe_tbl_api.c index 729bef4d2..135208c4e 100644 --- a/modules/tbl/fsw/src/cfe_tbl_api.c +++ b/modules/tbl/fsw/src/cfe_tbl_api.c @@ -95,14 +95,14 @@ CFE_Status_t CFE_TBL_Register(CFE_TBL_Handle_t *TblHandlePtr, const char *Name, { Status = CFE_TBL_ERR_INVALID_SIZE; - CFE_ES_WriteToSysLog("%s: Table %s has size of zero\n", __func__, Name); + CFE_ES_WriteToSysLog("%s: Table '%s' has size of zero\n", __func__, TblName); } else if ((Size > CFE_PLATFORM_TBL_MAX_SNGL_TABLE_SIZE) && ((TblOptionFlags & CFE_TBL_OPT_BUFFER_MSK) == CFE_TBL_OPT_SNGL_BUFFER)) { Status = CFE_TBL_ERR_INVALID_SIZE; - CFE_ES_WriteToSysLog("%s: Single Buffered Table '%s' has size %d > %d\n", __func__, Name, (int)Size, + CFE_ES_WriteToSysLog("%s: Single Buffered Table '%s' has size %d > %d\n", __func__, TblName, (int)Size, CFE_PLATFORM_TBL_MAX_SNGL_TABLE_SIZE); } else if ((Size > CFE_PLATFORM_TBL_MAX_DBL_TABLE_SIZE) && @@ -110,7 +110,7 @@ CFE_Status_t CFE_TBL_Register(CFE_TBL_Handle_t *TblHandlePtr, const char *Name, { Status = CFE_TBL_ERR_INVALID_SIZE; - CFE_ES_WriteToSysLog("%s: Dbl Buffered Table '%s' has size %d > %d\n", __func__, Name, (int)Size, + CFE_ES_WriteToSysLog("%s: Dbl Buffered Table '%s' has size %d > %d\n", __func__, TblName, (int)Size, CFE_PLATFORM_TBL_MAX_DBL_TABLE_SIZE); } @@ -125,7 +125,7 @@ CFE_Status_t CFE_TBL_Register(CFE_TBL_Handle_t *TblHandlePtr, const char *Name, Status = CFE_TBL_ERR_INVALID_OPTIONS; CFE_ES_WriteToSysLog("%s: User Def tbl '%s' cannot be dbl buff, load/dump or critical\n", __func__, - Name); + TblName); } } else if ((TblOptionFlags & CFE_TBL_OPT_LD_DMP_MSK) == CFE_TBL_OPT_DUMP_ONLY) @@ -137,7 +137,7 @@ CFE_Status_t CFE_TBL_Register(CFE_TBL_Handle_t *TblHandlePtr, const char *Name, Status = CFE_TBL_ERR_INVALID_OPTIONS; CFE_ES_WriteToSysLog("%s: Dump Only tbl '%s' cannot be double buffered or critical\n", __func__, - Name); + TblName); } } } @@ -254,9 +254,9 @@ CFE_Status_t CFE_TBL_Register(CFE_TBL_Handle_t *TblHandlePtr, const char *Name, Status = CFE_ES_GetPoolBuf(&RegRecPtr->Buffers[0].BufferPtr, CFE_TBL_Global.Buf.PoolHdl, Size); if (Status < 0) { - CFE_ES_WriteToSysLog("%s: 1st Buf Alloc GetPool fail Stat=0x%08X MemPoolHndl=0x%08lX\n", - __func__, (unsigned int)Status, - CFE_RESOURCEID_TO_ULONG(CFE_TBL_Global.Buf.PoolHdl)); + CFE_ES_WriteToSysLog( + "%s: 1st Buf Alloc GetPool for '%s' fail Stat=0x%08X MemPoolHndl=0x%08lX\n", __func__, + TblName, (unsigned int)Status, CFE_RESOURCEID_TO_ULONG(CFE_TBL_Global.Buf.PoolHdl)); } else { @@ -279,9 +279,9 @@ CFE_Status_t CFE_TBL_Register(CFE_TBL_Handle_t *TblHandlePtr, const char *Name, Status = CFE_ES_GetPoolBuf(&RegRecPtr->Buffers[1].BufferPtr, CFE_TBL_Global.Buf.PoolHdl, Size); if (Status < 0) { - CFE_ES_WriteToSysLog("%s: 2nd Buf Alloc GetPool fail Stat=0x%08X MemPoolHndl=0x%08lX\n", - __func__, (unsigned int)Status, - CFE_RESOURCEID_TO_ULONG(CFE_TBL_Global.Buf.PoolHdl)); + CFE_ES_WriteToSysLog( + "%s: 2nd Buf Alloc GetPool for '%s' fail Stat=0x%08X MemPoolHndl=0x%08lX\n", __func__, + TblName, (unsigned int)Status, CFE_RESOURCEID_TO_ULONG(CFE_TBL_Global.Buf.PoolHdl)); } else { @@ -364,8 +364,8 @@ CFE_Status_t CFE_TBL_Register(CFE_TBL_Handle_t *TblHandlePtr, const char *Name, /* do need to handle the error case because if the function */ /* call did fail, WorkingBufferPtr would be a NULL pointer. */ CFE_ES_GetAppName(AppName, ThisAppId, sizeof(AppName)); - CFE_ES_WriteToSysLog("%s: Failed to get work buffer for '%s.%s' (ErrCode=0x%08X)\n", - __func__, AppName, Name, (unsigned int)Status); + CFE_ES_WriteToSysLog("%s: Failed to get work buffer for Table '%s' (ErrCode=0x%08X)\n", + __func__, TblName, (unsigned int)Status); } else { @@ -375,8 +375,8 @@ CFE_Status_t CFE_TBL_Register(CFE_TBL_Handle_t *TblHandlePtr, const char *Name, if (Status != CFE_SUCCESS) { CFE_ES_GetAppName(AppName, ThisAppId, sizeof(AppName)); - CFE_ES_WriteToSysLog("%s: Failed to recover '%s.%s' from CDS (ErrCode=0x%08X)\n", - __func__, AppName, Name, (unsigned int)Status); + CFE_ES_WriteToSysLog("%s: Failed to recover Table '%s' from CDS (ErrCode=0x%08X)\n", + __func__, TblName, (unsigned int)Status); } } @@ -420,8 +420,8 @@ CFE_Status_t CFE_TBL_Register(CFE_TBL_Handle_t *TblHandlePtr, const char *Name, /* If an error occurred while trying to get the previous contents registry info, */ /* Log the error in the System Log and pretend like we created a new CDS */ CFE_ES_GetAppName(AppName, ThisAppId, sizeof(AppName)); - CFE_ES_WriteToSysLog("%s: Failed to recover '%s.%s' info from CDS TblReg\n", - __func__, AppName, Name); + CFE_ES_WriteToSysLog("%s: Failed to recover Table '%s' info from CDS TblReg\n", + __func__, TblName); Status = CFE_SUCCESS; } } @@ -452,7 +452,7 @@ CFE_Status_t CFE_TBL_Register(CFE_TBL_Handle_t *TblHandlePtr, const char *Name, else { CFE_ES_WriteToSysLog("%s: Failed to find a free Crit Tbl Reg Rec for '%s'\n", __func__, - RegRecPtr->Name); + TblName); } /* Mark the table as critical for future reference */ @@ -460,8 +460,8 @@ CFE_Status_t CFE_TBL_Register(CFE_TBL_Handle_t *TblHandlePtr, const char *Name, } else if (Status != CFE_TBL_INFO_RECOVERED_TBL) { - CFE_ES_WriteToSysLog("%s: Failed to register '%s.%s' as a CDS (ErrCode=0x%08X)\n", __func__, - AppName, Name, (unsigned int)Status); + CFE_ES_WriteToSysLog("%s: Failed to register Table '%s' as a CDS (ErrCode=0x%08X)\n", + __func__, TblName, (unsigned int)Status); /* Notify caller that although they asked for it to be critical, it isn't */ Status = CFE_TBL_WARN_NOT_CRITICAL;