From 47b700ceecd5cddfb0f9c1f335423e51477a6d68 Mon Sep 17 00:00:00 2001 From: Avi Date: Wed, 1 Sep 2021 18:29:43 +0200 Subject: [PATCH] Fix #1946, Correct typos in test, error messages Also fixes typo in github workflow error string --- .github/workflows/functional-tests.yml | 2 +- modules/core_private/ut-stubs/src/ut_osprintf_stubs.c | 4 ++-- modules/es/fsw/src/cfe_es_start.c | 4 ++-- modules/sb/fsw/src/cfe_sb_api.c | 2 +- modules/sbr/ut-coverage/test_cfe_sbr_route_unsorted.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/functional-tests.yml b/.github/workflows/functional-tests.yml index 0241f2b1e..0cda3b2fc 100644 --- a/.github/workflows/functional-tests.yml +++ b/.github/workflows/functional-tests.yml @@ -79,7 +79,7 @@ jobs: temp=$(grep -c "BEGIN" cf/cfe_test.tmp) if [ $temp -eq $counter ]; then - echo "Test is frozen. Quiting" + echo "Test is frozen. Quitting" break fi diff --git a/modules/core_private/ut-stubs/src/ut_osprintf_stubs.c b/modules/core_private/ut-stubs/src/ut_osprintf_stubs.c index ddb5bfcd6..5a6af8b28 100644 --- a/modules/core_private/ut-stubs/src/ut_osprintf_stubs.c +++ b/modules/core_private/ut-stubs/src/ut_osprintf_stubs.c @@ -64,7 +64,7 @@ const char *UT_OSP_MESSAGES[] = { [UT_OSP_LIBRARY_SLOTS] = "%s: No free library slots available\n", [UT_OSP_EXTRACT_FILENAME_UT] = "%s: Unable to extract filename from path: %s.\n", [UT_OSP_APP_PATH_FILE_TOO_LONG] = "%s: Application path plus file name length (%d) exceeds max allowed (%d)\n", - [UT_OSP_REFORMAT_VOLATILE] = "%s: Error Re-Formating Volatile(RAM) Volume. EC = %ld\n", + [UT_OSP_REFORMAT_VOLATILE] = "%s: Error Re-Formatting Volatile(RAM) Volume. EC = %ld\n", [UT_OSP_EXTRACT_FILENAME_UT55] = "%s: Could not load file:%s. EC = %ld\n", [UT_OSP_EXTRACT_FILENAME_UT46] = "%s: Unable to extract filename from path: %s.\n", [UT_OSP_NO_FREE_APP_SLOTS] = "%s: No free application slots available\n", @@ -75,7 +75,7 @@ const char *UT_OSP_MESSAGES[] = { [UT_OSP_APP_INIT] = "%s: Application Init Failed,RC=0x%08X\n", [UT_OSP_POR_MAX_PROC_RESETS] = "%s: POWER ON RESET due to max proc resets (Commanded).\n", [UT_OSP_CANNOT_RESTART_APP] = "%s: Cannot Restart Application %s, It is not running.\n", - [UT_OSP_INSUFF_FREE_SPACE] = "%s: Insufficent Free Space on Volatile Disk, Reformatting.\n", + [UT_OSP_INSUFF_FREE_SPACE] = "%s: Insufficient Free Space on Volatile Disk, Reformatting.\n", [UT_OSP_LOAD_SHARED_LIBRARY] = "%s: Could not load cFE Shared Library\n", [UT_OSP_POR_HW_SPECIAL] = "%s: POWER ON RESET due to HW Special Cmd (Hw Spec Cmd).\n", [UT_OSP_APP_CREATE] = "%s: AppCreate Error: TaskCreate %s Failed. EC = %ld!\n", diff --git a/modules/es/fsw/src/cfe_es_start.c b/modules/es/fsw/src/cfe_es_start.c index f20a1fa3e..1a9366343 100644 --- a/modules/es/fsw/src/cfe_es_start.c +++ b/modules/es/fsw/src/cfe_es_start.c @@ -595,7 +595,7 @@ void CFE_ES_InitializeFileSystems(uint32 StartType) if (PercentFree < CFE_PLATFORM_ES_RAM_DISK_PERCENT_RESERVED) { - CFE_ES_WriteToSysLog("%s: Insufficent Free Space on Volatile Disk, Reformatting.\n", __func__); + CFE_ES_WriteToSysLog("%s: Insufficient Free Space on Volatile Disk, Reformatting.\n", __func__); /* ** First, unmount the disk @@ -641,7 +641,7 @@ void CFE_ES_InitializeFileSystems(uint32 StartType) else { - CFE_ES_WriteToSysLog("%s: Error Re-Formating Volatile(RAM) Volume. EC = %ld\n", __func__, + CFE_ES_WriteToSysLog("%s: Error Re-Formatting Volatile(RAM) Volume. EC = %ld\n", __func__, (long)OsStatus); /* ** Delay to allow the message to be read diff --git a/modules/sb/fsw/src/cfe_sb_api.c b/modules/sb/fsw/src/cfe_sb_api.c index b3a24a701..fb5f119be 100644 --- a/modules/sb/fsw/src/cfe_sb_api.c +++ b/modules/sb/fsw/src/cfe_sb_api.c @@ -1301,7 +1301,7 @@ int32 CFE_SB_UnsubscribeFull(CFE_SB_MsgId_t MsgId, CFE_SB_PipeId_t PipeId, uint8 case CFE_SB_UNSUB_ARG_ERR_EID: CFE_EVS_SendEventWithAppID(CFE_SB_UNSUB_ARG_ERR_EID, CFE_EVS_EventType_ERROR, CFE_SB_Global.AppId, - "UnSubscribe Err:Bad Arg,MsgId 0x%x,PipeId %lu,app %s,scope %d", + "Unsubscribe Err:Bad Arg,MsgId 0x%x,PipeId %lu,app %s,scope %d", (unsigned int)CFE_SB_MsgIdToValue(MsgId), CFE_RESOURCEID_TO_ULONG(PipeId), CFE_SB_GetAppTskName(TskId, FullName), (int)Scope); break; diff --git a/modules/sbr/ut-coverage/test_cfe_sbr_route_unsorted.c b/modules/sbr/ut-coverage/test_cfe_sbr_route_unsorted.c index bfd65a870..ac42a031e 100644 --- a/modules/sbr/ut-coverage/test_cfe_sbr_route_unsorted.c +++ b/modules/sbr/ut-coverage/test_cfe_sbr_route_unsorted.c @@ -67,7 +67,7 @@ void Test_SBR_Route_Unsort_General(void) CFE_SBR_ForEachRouteId(Test_SBR_Callback, &count, NULL); UtAssert_INT32_EQ(count, 0); - UtPrintf("Add maximum mesage id value"); + UtPrintf("Add maximum message id value"); msgid = CFE_SB_ValueToMsgId(CFE_PLATFORM_SB_HIGHEST_VALID_MSGID); routeid = CFE_SBR_AddRoute(msgid, &collisions); UtAssert_INT32_EQ(collisions, 0);