Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix #116, correct format spec strings and types #117

Merged
merged 1 commit into from
Jan 11, 2024
Merged

Fix #116, correct format spec strings and types #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fsw/src/hs_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ CFE_Status_t HS_AppInit(void)
if (Status != CFE_SUCCESS)
{
CFE_EVS_SendEvent(HS_SYSMON_INIT_ERR_EID, CFE_EVS_EventType_ERROR,
"Error in system monitor initialization, RC=0x%08X", Status);
"Error in system monitor initialization, RC=0x%08X", (unsigned int)Status);
return Status;
}

Expand Down
2 changes: 1 addition & 1 deletion fsw/src/hs_cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ CFE_Status_t HS_SendHkCmd(const HS_SendHkCmd_t *BufPtr)
/* ExeCount remains HS_INVALID_EXECOUNT */
CFE_EVS_SendEvent(HS_HKREQ_RESOURCE_DBG_EID, CFE_EVS_EventType_DEBUG,
"Housekeeping req found unknown resource. Type=0x%08X",
HS_AppData.XCTablePtr[TableIndex].ResourceType);
(unsigned int)HS_AppData.XCTablePtr[TableIndex].ResourceType);
break;
} /* end ResourceType switch statement */
} /* end ExeCountState if statement */
Expand Down
6 changes: 2 additions & 4 deletions unit-test/hs_monitors_tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ void HS_MonitorApplications_Test_ProcessorResetError(void)
/* Verify results */
UtAssert_True(HS_AppData.AppMonCheckInCountdown[0] == 0, "HS_AppData.AppMonCheckInCountdown[0] == 0 %u",
HS_AppData.AppMonCheckInCountdown[0]);
UtAssert_True(HS_AppData.AppMonEnables[0] == 0, "HS_AppData.AppMonEnables[0] == 0 %u", HS_AppData.AppMonEnables[0]);
UtAssert_UINT32_EQ(HS_AppData.AppMonEnables[0], 0);
UtAssert_True(HS_AppData.ServiceWatchdogFlag == HS_STATE_DISABLED,
"HS_AppData.ServiceWatchdogFlag == HS_STATE_DISABLED");

Expand Down Expand Up @@ -1690,9 +1690,7 @@ void HS_MonitorUtilization_Test_HighCurrentUtil(void)
HS_MonitorUtilization();

/* Verify results */
UtAssert_True(HS_AppData.UtilizationTracker[HS_AppData.CurrentCPUUtilIndex - 1] == HS_CPU_UTILIZATION_MAX,
"HS_AppData.UtilizationTracker[HS_AppData.CurrentCPUUtilIndex - 1] == HS_CPU_UTILIZATION_MAX %u %u",
HS_AppData.UtilizationTracker[HS_AppData.CurrentCPUUtilIndex - 1], HS_CPU_UTILIZATION_MAX);
UtAssert_INT32_EQ(HS_AppData.UtilizationTracker[HS_AppData.CurrentCPUUtilIndex - 1], HS_CPU_UTILIZATION_MAX);
/* For this test case, we don't care about any messages or variables changed after this is set */

call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent));
Expand Down
Loading