Skip to content

Commit

Permalink
Fix nasa#1325, UT updates for syslog function prefix
Browse files Browse the repository at this point in the history
  • Loading branch information
@skliper
skliper committed Jun 15, 2021
1 parent faff2dc commit abe68b5
Show file tree
Hide file tree
Showing 6 changed files with 79 additions and 149 deletions.
10 changes: 0 additions & 10 deletions modules/cfe_assert/src/cfe_assert_runner.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,16 +222,6 @@ void CFE_Assert_ExecuteTest(void)
/* unregister the callback and unset the appid */
UT_BSP_Lock();
CFE_Assert_RegisterCallback(NULL);
<<<<<<< HEAD
CFE_Assert_Global.OwnerAppId = CFE_ES_APPID_UNDEFINED;
UT_BSP_Unlock();
=======

/* Release the access mutex so the next test program can run */
rc = OS_MutSemGive(CFE_Assert_Global.AccessMutex);
if (rc != CFE_SUCCESS)
{
CFE_ES_WriteToSysLog("%s: Error from OS_MutSemGive(): %d\n", __func__, (int)rc);
}
>>>>>>> Fix #1325, Prepend system log writes with function name
}
179 changes: 60 additions & 119 deletions modules/core_private/ut-stubs/src/ut_osprintf_stubs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,123 +41,64 @@
*/

const char *UT_OSP_MESSAGES[] = {
[0] = NULL, /* Message 0 is reserved */
/* ES Startup: Error Mounting Volatile(RAM) Volume. EC = 0x~ */
[UT_OSP_MOUNT_VOLATILE] = "ES Startup: Error Mounting Volatile(RAM) Volume. EC = 0x%08X\n",
/* CFE_ES_ExitApp: CORE Application CFE_ES Had a Runtime Error. */
[UT_OSP_CORE_RUNTIME] = "CFE_ES_ExitApp: CORE Application %s Had a Runtime Error.\n",
/* ES Startup: OS_TaskCreate error creating core App: CFE_TBL: EC = 0x~ */
[UT_OSP_CORE_APP_CREATE] = "ES Startup: OS_TaskCreate error creating core App: %s: EC = 0x%08X\n",
/* ES Startup: Error returned when calling function: CFE_TBL_EarlyInit: EC = 0x~ */
[UT_OSP_EARLYINIT] = "ES Startup: Error returned when calling function: %s: EC = 0x%08X\n",
/* ES Startup: Could not find Library Init symbol:TST_LIB_Init. EC = 0x~ */
[UT_OSP_FIND_LIBRARY] = "ES Startup: Could not find Library Init symbol:%s. EC = %d\n",
/* POWER ON RESET due to max proc resets (HW Spec Cmd). */
[UT_OSP_POR_MAX_HW_SPECIAL] = "POWER ON RESET due to max proc resets (HW Spec Cmd).\n",
/* CFE_ES_ExitChildTask Error: Cannot Call from a cFE App Main Task. ID = ~ */
[UT_OSP_CANNOT_CALL_APP_MAIN] = "CFE_ES_ExitChildTask Error: Cannot Call from a cFE App Main Task. ID = %d\n",
/* ES Startup: bad function pointer ( table entry = 1). */
[UT_OSP_FUNCTION_POINTER] = "ES Startup: bad function pointer ( table entry = %d).\n",
/* ES Startup: Error Reading Startup file. EC = 0x~ */
[UT_OSP_STARTUP_READ] = "ES Startup: Error Reading Startup file. EC = 0x%08X\n",
/* PROCESSOR RESET called from CFE_ES_ResetCFE (Commanded). */
[UT_OSP_PROC_RESET_COMMANDED] = "PROCESSOR RESET called from CFE_ES_ResetCFE (Commanded).\n",
/* ES SharedData Mutex Take Err Stat=0x~,App=1,Func=TestAPI,Line=12345 */
[UT_OSP_MUTEX_TAKE] = "ES SharedData Mutex Take Err Stat=0x%x,Func=%s,Line=%d\n",
/* ES Startup: Startup Sync failed - Applications may not have all started */
[UT_OSP_STARTUP_SYNC_FAIL_1] = "ES Startup: Startup Sync failed - Applications may not have all started\n",
/* Warning: System Log full, log entry discarded. */
[UT_OSP_SYSTEM_LOG_FULL] = "Warning: System Log full, log entry discarded.\n",
/* ES Startup: ES Startup File Line is too long: 137 bytes. */
[UT_OSP_FILE_LINE_TOO_LONG] = "ES Startup: **WARNING** File Line %u is malformed: %u bytes, %u tokens.\n",
/* ES Startup: Load Shared Library Init Error. */
[UT_OSP_SHARED_LIBRARY_INIT] = "ES Startup: Load Shared Library Init Error = 0x%08x\n",
/* ES Startup: Error Removing Volatile(RAM) Volume. EC = 0x~ */
[UT_OSP_REMOVE_VOLATILE] = "ES Startup: Error Removing Volatile(RAM) Volume. EC = 0x%08X\n",
/* POWER ON RESET due to other cause (See Subtype). */
[UT_OSP_POR_OTHER] = "POWER ON RESET due to other cause (See Subtype).\n",
/* ES Startup: Error Determining Blocks Free on Volume. EC = 0x~ */
[UT_OSP_DETERMINE_BLOCKS] = "ES Startup: Error Determining Blocks Free on Volume. EC = 0x%08X\n",
/* ES Startup: Startup Sync failed - Applications may not have all initialized */
[UT_OSP_STARTUP_SYNC_FAIL_2] = "ES Startup: Startup Sync failed - Applications may not have all initialized\n",
/* ES Startup: No free library slots available */
[UT_OSP_LIBRARY_SLOTS] = "ES Startup: No free library slots available\n",
/* ES Startup: Unable to extract filename from path: ut/filename.gz. */
[UT_OSP_EXTRACT_FILENAME_UT] = "ES Startup: Unable to extract filename from path: %s.\n",
/* ES Startup: Application path plus file name length (~) exceeds max allowed (~) */
[UT_OSP_APP_PATH_FILE_TOO_LONG] =
"ES Startup: Application path plus file name length (%d) exceeds max allowed (%d)\n",
/* ES Startup: Error Re-Formating Volatile(RAM) Volume. EC = 0x~ */
[UT_OSP_REFORMAT_VOLATILE] = "ES Startup: Error Re-Formating Volatile(RAM) Volume. EC = 0x%08X\n",
/* ES Startup: Could not load cFE application file:ut/filename.x. EC = 0x~ */
[UT_OSP_EXTRACT_FILENAME_UT55] = "ES Startup: Could not load file:%s. EC = 0x%08X\n",
/* ES Startup: Unable to extract filename from path: ut46/ */
[UT_OSP_EXTRACT_FILENAME_UT46] = "ES Startup: Unable to extract filename from path: %s.\n",
/* ES Startup: No free application slots available */
[UT_OSP_NO_FREE_APP_SLOTS] = "ES Startup: No free application slots available\n",
/* ES Startup: Unable to extract filename from path: ut57/ */
[UT_OSP_EXTRACT_FILENAME_UT57] = "ES Startup: Unable to extract filename from path: %s.\n",
/* ES SharedData Mutex Give Err Stat=0x~,App=1,Func=TestAPI,Line=98765 */
[UT_OSP_MUTEX_GIVE] = "ES SharedData Mutex Give Err Stat=0x%x,Func=%s,Line=%d\n",
/* ES Startup: Could not find symbol:EntryPoint. EC = 0x~ */
[UT_OSP_CANNOT_FIND_SYMBOL] = "ES Startup: Could not find symbol:%s. EC = 0x%08X\n",
/* ES Startup: Error Initializing Volatile(RAM) Volume. EC = 0x~ */
[UT_OSP_INIT_VOLATILE] = "ES Startup: Error Initializing Volatile(RAM) Volume. EC = 0x%08X\n",
/* ES:Application Init Failed,RC=0x~ */
[UT_OSP_APP_INIT] = "ES:Application Init Failed,RC=0x%08X\n",
/* POWER ON RESET due to max proc resets (Commanded). */
[UT_OSP_POR_MAX_PROC_RESETS] = "POWER ON RESET due to max proc resets (Commanded).\n",
/* CFE_ES_RestartApp: Cannot Restart Application appName, It is not running. */
[UT_OSP_CANNOT_RESTART_APP] = "CFE_ES_RestartApp: Cannot Restart Application %s, It is not running.\n",
/* ES Startup: Insufficent Free Space on Volatile Disk, Reformatting. */
[UT_OSP_INSUFF_FREE_SPACE] = "ES Startup: Insufficent Free Space on Volatile Disk, Reformatting.\n",
/* ES Startup: Could not load cFE Shared Library */
[UT_OSP_LOAD_SHARED_LIBRARY] = "ES Startup: Could not load cFE Shared Library\n",
/* POWER ON RESET due to HW Special Cmd (Hw Spec Cmd). */
[UT_OSP_POR_HW_SPECIAL] = "POWER ON RESET due to HW Special Cmd (Hw Spec Cmd).\n",
/* ES Startup: AppCreate Error: TaskCreate AppName Failed. EC = 0x~! */
[UT_OSP_APP_CREATE] = "ES Startup: AppCreate Error: TaskCreate %s Failed. EC = 0x%08X!\n",
/* ES Startup: Error Creating Volatile(RAM) Volume. EC = 0x~ */
[UT_OSP_CREATE_VOLATILE] = "ES Startup: Error Creating Volatile(RAM) Volume. EC = 0x%08X\n",
/* ES Startup: Failed to unload APP: AppName. EC = 0x~ */
[UT_OSP_MODULE_UNLOAD_FAILED] = "ES Startup: Failed to unload: %s. EC = 0x%08X\n",
/* POWERON RESET called from CFE_ES_ResetCFE (Commanded). */
[UT_OSP_POR_COMMANDED] = "POWERON RESET called from CFE_ES_ResetCFE (Commanded).\n",
/* ES Startup: Error Re-Mounting Volatile(RAM) Volume. EC = 0x~ */
[UT_OSP_REMOUNT_VOLATILE] = "ES Startup: Error Re-Mounting Volatile(RAM) Volume. EC = 0x%08X\n",
/* CFE_ES_ExitApp, Cannot Exit CORE Application CFE_ES */
[UT_OSP_CORE_APP_EXIT] = "CFE_ES_ExitApp, Cannot Exit CORE Application %s\n",
/* ES Startup: Opened ES App Startup file: */
[UT_OSP_ES_APP_STARTUP_OPEN] = "ES Startup: Opened ES App Startup file: %s\n",
/* CFE_ES_ExitApp: CORE Application CFE_ES Had an Init Error. */
[UT_OSP_CORE_INIT] = "CFE_ES_ExitApp: CORE Application %s Had an Init Error.\n",
/* PROCESSOR RESET due to Hardware Special Command (HW Spec Cmd). */
[UT_OSP_PROC_RESET_MAX_HW_SPECIAL] = "PROCESSOR RESET due to Hardware Special Command (HW Spec Cmd).\n",
/* ES:Error reading cmd pipe,RC=0x~ */
[UT_OSP_COMMAND_PIPE] = "ES:Error reading cmd pipe,RC=0x%08X\n",
/* ES Startup: Error Un-Mounting Volatile(RAM) Volume. EC = 0x~ */
[UT_OSP_UNMOUNT_VOLATILE] = "ES Startup: Error Un-Mounting Volatile(RAM) Volume. EC = 0x%08X\n",
/* ES Startup: Error: ES_TaskTable slot in use at task creation! */
[UT_OSP_TABLE_SLOT_IN_USE] = "ES Startup: Error: ES_TaskTable slot in use at task creation!\n",
/* ES Startup: Error, Can't Open ES App Startup file: */
[UT_OSP_CANNOT_OPEN_ES_APP_STARTUP] = "ES Startup: Error, Can't Open ES App Startup file: %s EC = 0x%08X\n",
/* ES Startup: Unable to extract filename from path: /cf/apps/tst_lib.bundle.gz. */
[UT_OSP_EXTRACT_FILENAME_CF] = "ES Startup: Unable to extract filename from path: %s.\n",
/* Warning: Invalid System Log mode, log entry discarded. */
[UT_OSP_INVALID_LOG_MODE] = "Warning: Invalid System Log mode, log entry discarded.\n",
/* ES Startup: Library path plus file name length (~) exceeds max allowed (~) */
[UT_OSP_LIB_PATH_FILE_TOO_LONG] = "ES Startup: Library path plus file name length (%d) exceeds max allowed (%d)\n",
/* ES Startup: Unable to decompress Application File: ut/filename.gz */
[UT_OSP_DECOMPRESS_APP] = "ES Startup: Unable to decompress Application File: %s\n",
/* ES Startup: Unable to decompress library file: /cf/apps/tst_lib.bundle.gz */
[UT_OSP_DECOMPRESS_LIBRARY] = "ES Startup: Unable to decompress library file: %s\n",
/* CFE_ES_ExitChildTask Error Calling CFE_ES_GetAppID. Task ID = ~, RC = 0x~ */
[UT_OSP_GET_APP_ID] = "CFE_ES_ExitChildTask Error Calling CFE_ES_GetAppID. Task ID = %d, RC = 0x%08X\n",
/* ES Startup: Error, No free application slots available for CORE App! */
[UT_OSP_NO_FREE_CORE_APP_SLOTS] = "ES Startup: Error, No free application slots available for CORE App!\n",
/* ES Startup: CFE_ES_Global.TaskTable record used error for App: CFE_EVS, continuing. */
[UT_OSP_RECORD_USED] = "ES Startup: Error: ES_TaskTable slot for ID %lx in use at task creation!\n",
/* CFE_ES_ExitChildTask called from invalid task context */
[UT_OSP_TASKEXIT_BAD_CONTEXT] = "CFE_ES_ExitChildTask called from invalid task context\n",
[UT_OSP_BACKGROUND_TAKE] = "CFE_ES: Failed to take background sem: %08lx\n",
[0] = NULL, /* Message 0 is reserved */
[UT_OSP_MOUNT_VOLATILE] = "%s: Error Mounting Volatile(RAM) Volume. EC = 0x%08X\n",
[UT_OSP_CORE_RUNTIME] = "%s: CORE Application %s Had a Runtime Error.\n",
[UT_OSP_CORE_APP_CREATE] = "%s: OS_TaskCreate error creating core App: %s: EC = 0x%08X\n",
[UT_OSP_EARLYINIT] = "%s: Error returned when calling function: %s: EC = 0x%08X\n",
[UT_OSP_FIND_LIBRARY] = "%s: Could not find Library Init symbol:%s. EC = %d\n",
[UT_OSP_POR_MAX_HW_SPECIAL] = "%s: POWER ON RESET due to max proc resets (HW Spec Cmd).\n",
[UT_OSP_CANNOT_CALL_APP_MAIN] = "%s: Error: Cannot Call from a cFE App Main Task. ID = %d\n",
[UT_OSP_FUNCTION_POINTER] = "%s: bad function pointer ( table entry = %d).\n",
[UT_OSP_STARTUP_READ] = "%s: Error Reading Startup file. EC = 0x%08X\n",
[UT_OSP_PROC_RESET_COMMANDED] = "%s: PROCESSOR RESET called from CFE_ES_ResetCFE (Commanded).\n",
[UT_OSP_MUTEX_TAKE] = "%s: SharedData Mutex Take Err Stat=0x%x,Func=%s,Line=%d\n",
[UT_OSP_STARTUP_SYNC_FAIL_1] = "%s: Startup Sync failed - Applications may not have all started\n",
[UT_OSP_SYSTEM_LOG_FULL] = "Warning: System Log full, log entry discarded.\n",
[UT_OSP_FILE_LINE_TOO_LONG] = "%s: **WARNING** File Line %u is malformed: %u bytes, %u tokens.\n",
[UT_OSP_SHARED_LIBRARY_INIT] = "%s: Load Shared Library Init Error = 0x%08x\n",
[UT_OSP_REMOVE_VOLATILE] = "%s: Error Removing Volatile(RAM) Volume. EC = 0x%08X\n",
[UT_OSP_POR_OTHER] = "%s: POWER ON RESET due to other cause (See Subtype).\n",
[UT_OSP_DETERMINE_BLOCKS] = "%s: Error Determining Blocks Free on Volume. EC = 0x%08X\n",
[UT_OSP_STARTUP_SYNC_FAIL_2] = "%s: Startup Sync failed - Applications may not have all initialized\n",
[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 = 0x%08X\n",
[UT_OSP_EXTRACT_FILENAME_UT55] = "%s: Could not load file:%s. EC = 0x%08X\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",
[UT_OSP_EXTRACT_FILENAME_UT57] = "%s: Unable to extract filename from path: %s.\n",
[UT_OSP_MUTEX_GIVE] = "%s: SharedData Mutex Give Err Stat=0x%x,Func=%s,Line=%d\n",
[UT_OSP_CANNOT_FIND_SYMBOL] = "%s: Could not find symbol:%s. EC = 0x%08X\n",
[UT_OSP_INIT_VOLATILE] = "%s: Error Initializing Volatile(RAM) Volume. EC = 0x%08X\n",
[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_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 = 0x%08X!\n",
[UT_OSP_CREATE_VOLATILE] = "%s: Error Creating Volatile(RAM) Volume. EC = 0x%08X\n",
[UT_OSP_MODULE_UNLOAD_FAILED] = "%s: Failed to unload: %s. EC = 0x%08X\n",
[UT_OSP_POR_COMMANDED] = "%s: POWERON RESET called from CFE_ES_ResetCFE (Commanded).\n",
[UT_OSP_REMOUNT_VOLATILE] = "%s: Error Re-Mounting Volatile(RAM) Volume. EC = 0x%08X\n",
[UT_OSP_CORE_APP_EXIT] = "%s: Cannot Exit CORE Application %s\n",
[UT_OSP_ES_APP_STARTUP_OPEN] = "%s: Opened ES App Startup file: %s\n",
[UT_OSP_CORE_INIT] = "%s: CORE Application %s Had an Init Error.\n",
[UT_OSP_PROC_RESET_MAX_HW_SPECIAL] = "%s: PROCESSOR RESET due to Hardware Special Command (HW Spec Cmd).\n",
[UT_OSP_COMMAND_PIPE] = "%s: Error reading cmd pipe,RC=0x%08X\n",
[UT_OSP_UNMOUNT_VOLATILE] = "%s: Error Un-Mounting Volatile(RAM) Volume. EC = 0x%08X\n",
[UT_OSP_TABLE_SLOT_IN_USE] = "%s: Error: ES_TaskTable slot in use at task creation!\n",
[UT_OSP_CANNOT_OPEN_ES_APP_STARTUP] = "%s: Error, Can't Open ES App Startup file: %s EC = 0x%08X\n",
[UT_OSP_EXTRACT_FILENAME_CF] = "%s: Unable to extract filename from path: %s.\n",
[UT_OSP_INVALID_LOG_MODE] = "Warning: Invalid System Log mode, log entry discarded.\n",
[UT_OSP_LIB_PATH_FILE_TOO_LONG] = "%s: Library path plus file name length (%d) exceeds max allowed (%d)\n",
[UT_OSP_DECOMPRESS_APP] = "%s: Unable to decompress Application File: %s\n",
[UT_OSP_DECOMPRESS_LIBRARY] = "%s: Unable to decompress library file: %s\n",
[UT_OSP_GET_APP_ID] = "%s: Error Calling CFE_ES_GetAppID. Task ID = %d, RC = 0x%08X\n",
[UT_OSP_NO_FREE_CORE_APP_SLOTS] = "%s: Error, No free application slots available for CORE App!\n",
[UT_OSP_RECORD_USED] = "%s: Error: ES_TaskTable slot for ID %lx in use at task creation!\n",
[UT_OSP_TASKEXIT_BAD_CONTEXT] = "%s: Called from invalid task context\n",
[UT_OSP_BACKGROUND_TAKE] = "%s: Failed to take background sem: %08lx\n",
};
26 changes: 13 additions & 13 deletions modules/evs/ut-coverage/evs_UT.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,20 @@

static const char *EVS_SYSLOG_MSGS[] = {
NULL,
"EVS call to CFE_PSP_GetResetArea failed, RC=0x%08x\n",
"Unexpected size from CFE_PSP_GetResetArea: expected = 0x%08lX, actual = 0x%08lX\n",
"EVS call to OS_MutSemCreate failed, RC=0x%08x\n",
"Event Log cleared following power-on reset\n",
"Event Log cleared, n=%d, c=%d, f=%d, m=%d, o=%d\n",
"Event Log restored, n=%d, c=%d, f=%d, m=%d, o=%d\n",
"EVS:Application Init Failed,RC=0x%08X\n",
"EVS:Error reading cmd pipe,RC=0x%08X\n",
"%s: Call to CFE_PSP_GetResetArea failed, RC=0x%08x\n",
"%s: Unexpected size from CFE_PSP_GetResetArea: expected = 0x%08lX, actual = 0x%08lX\n",
"%s: OS_MutSemCreate failed, RC=0x%08x\n",
"%s: Event Log cleared following power-on reset\n",
"%s: Event Log cleared, n=%d, c=%d, f=%d, m=%d, o=%d\n",
"%s: Event Log restored, n=%d, c=%d, f=%d, m=%d, o=%d\n",
"%s: Application Init Failed,RC=0x%08X\n",
"%s: Error reading cmd pipe,RC=0x%08X\n",
NULL, /* old message removed - placeholder to maintain indices */
"EVS:Call to CFE_ES_GetAppID Failed:RC=0x%08X\n",
"EVS:Call to CFE_EVS_Register Failed:RC=0x%08X\n",
"EVS:Call to CFE_SB_CreatePipe Failed:RC=0x%08X\n",
"EVS:Subscribing to Cmds Failed:RC=0x%08X\n",
"EVS:Subscribing to HK Request Failed:RC=0x%08X\n"};
"%s: Call to CFE_ES_GetAppID Failed:RC=0x%08X\n",
"%s: Call to CFE_EVS_Register Failed:RC=0x%08X\n",
"%s: Call to CFE_SB_CreatePipe Failed:RC=0x%08X\n",
"%s: Subscribing to Cmds Failed:RC=0x%08X\n",
"%s: Subscribing to HK Request Failed:RC=0x%08X\n"};

static const UT_TaskPipeDispatchId_t UT_TPID_CFE_EVS_CMD_NOOP_CC = {.MsgId = CFE_SB_MSGID_WRAP_VALUE(CFE_EVS_CMD_MID),
.CommandCode = CFE_EVS_NOOP_CC};
Expand Down
3 changes: 1 addition & 2 deletions modules/fs/fsw/src/cfe_fs_api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,7 @@ CFE_Status_t CFE_FS_SetTimestamp(osal_id_t FileDes, CFE_TIME_SysTime_t NewTimest
}
else
{
CFE_ES_WriteToSysLog("%s: Failed to lseek time fields (Status=0x%08X)\n", __func__,
(unsigned int)Result);
CFE_ES_WriteToSysLog("%s: Failed to lseek time fields (Status=0x%08X)\n", __func__, (unsigned int)Result);
}

return (Result);
Expand Down
4 changes: 2 additions & 2 deletions modules/fs/ut-coverage/fs_UT.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@

#include "target_config.h"

const char *FS_SYSLOG_MSGS[] = {NULL, "FS SharedData Mutex Take Err Stat=0x%x,App=%lu,Function=%s\n",
"FS SharedData Mutex Give Err Stat=0x%x,App=%lu,Function=%s\n"};
const char *FS_SYSLOG_MSGS[] = {NULL, "%s: SharedData Mutex Take Err Stat=0x%x,App=%lu,Function=%s\n",
"%s: SharedData Mutex Give Err Stat=0x%x,App=%lu,Function=%s\n"};

/* counts the number of times UT_FS_OnEvent() was invoked (below) */
uint32 UT_FS_FileWriteEventCount[CFE_FS_FileWriteEvent_MAX];
Expand Down
6 changes: 3 additions & 3 deletions modules/time/ut-coverage/time_UT.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
/*
** External global variables
*/
const char *TIME_SYSLOG_MSGS[] = {NULL, "TIME:Error reading cmd pipe,RC=0x%08X\n",
"TIME:Application Init Failed,RC=0x%08X\n", "TIME:1Hz OS_TimerAdd failed:RC=0x%08X\n",
"TIME:1Hz OS_TimerSet failed:RC=0x%08X\n"};
const char *TIME_SYSLOG_MSGS[] = {NULL, "%s: Error reading cmd pipe,RC=0x%08X\n",
"%s: Application Init Failed,RC=0x%08X\n", "%s: 1Hz OS_TimerAdd failed:RC=0x%08X\n",
"%s: 1Hz OS_TimerSet failed:RC=0x%08X\n"};

static const UT_TaskPipeDispatchId_t UT_TPID_CFE_TIME_SEND_HK = {.MsgId =
CFE_SB_MSGID_WRAP_VALUE(CFE_TIME_SEND_HK_MID)};
Expand Down

0 comments on commit abe68b5

Please sign in to comment.