Skip to content

Commit

Permalink
Fix nasa#1325, Prepend CFE_ES_SysLogWrite_Unsync with function name
Browse files Browse the repository at this point in the history
  • Loading branch information
@skliper
skliper committed Jun 7, 2021
1 parent 176e3df commit 306593b
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 52 deletions.
62 changes: 31 additions & 31 deletions modules/es/fsw/src/cfe_es_api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,13 @@ CFE_Status_t CFE_ES_RestartApp(CFE_ES_AppId_t AppID)
*/
if (AppRecPtr->Type == CFE_ES_AppType_CORE)
{
CFE_ES_SysLogWrite_Unsync("CFE_ES_RestartApp: Cannot Restart a CORE Application: %s.\n",
CFE_ES_SysLogWrite_Unsync("%s: Cannot Restart a CORE Application: %s.\n", __func__,
CFE_ES_AppRecordGetName(AppRecPtr));
ReturnCode = CFE_ES_ERR_RESOURCEID_NOT_VALID;
}
else if (AppRecPtr->AppState != CFE_ES_AppState_RUNNING)
{
CFE_ES_SysLogWrite_Unsync("CFE_ES_RestartApp: Cannot Restart Application %s, It is not running.\n",
CFE_ES_SysLogWrite_Unsync("%s: Cannot Restart Application %s, It is not running.\n", __func__,
CFE_ES_AppRecordGetName(AppRecPtr));
ReturnCode = CFE_ES_ERR_RESOURCEID_NOT_VALID;
}
Expand All @@ -199,13 +199,13 @@ CFE_Status_t CFE_ES_RestartApp(CFE_ES_AppId_t AppID)
*/
if (OS_stat(AppRecPtr->StartParams.BasicInfo.FileName, &FileStatus) == OS_SUCCESS)
{
CFE_ES_SysLogWrite_Unsync("CFE_ES_RestartApp: Restart Application %s Initiated\n",
CFE_ES_SysLogWrite_Unsync("%s: Restart Application %s Initiated\n", __func__,
CFE_ES_AppRecordGetName(AppRecPtr));
AppRecPtr->ControlReq.AppControlRequest = CFE_ES_RunStatus_SYS_RESTART;
}
else
{
CFE_ES_SysLogWrite_Unsync("CFE_ES_RestartApp: Cannot Restart Application %s, File %s does not exist.\n",
CFE_ES_SysLogWrite_Unsync("%s: Cannot Restart Application %s, File %s does not exist.\n", __func__,
CFE_ES_AppRecordGetName(AppRecPtr),
AppRecPtr->StartParams.BasicInfo.FileName);
ReturnCode = CFE_ES_FILE_IO_ERR;
Expand Down Expand Up @@ -252,13 +252,13 @@ CFE_Status_t CFE_ES_ReloadApp(CFE_ES_AppId_t AppID, const char *AppFileName)
*/
if (AppRecPtr->Type == CFE_ES_AppType_CORE)
{
CFE_ES_SysLogWrite_Unsync("CFE_ES_DeleteApp: Cannot Reload a CORE Application: %s.\n",
CFE_ES_SysLogWrite_Unsync("%s: Cannot Reload a CORE Application: %s.\n", __func__,
CFE_ES_AppRecordGetName(AppRecPtr));
ReturnCode = CFE_ES_ERR_RESOURCEID_NOT_VALID;
}
else if (AppRecPtr->AppState != CFE_ES_AppState_RUNNING)
{
CFE_ES_SysLogWrite_Unsync("CFE_ES_ReloadApp: Cannot Reload Application %s, It is not running.\n",
CFE_ES_SysLogWrite_Unsync("%s: Cannot Reload Application %s, It is not running.\n", __func__,
CFE_ES_AppRecordGetName(AppRecPtr));
ReturnCode = CFE_ES_ERR_RESOURCEID_NOT_VALID;
}
Expand All @@ -269,7 +269,7 @@ CFE_Status_t CFE_ES_ReloadApp(CFE_ES_AppId_t AppID, const char *AppFileName)
*/
if (OS_stat(AppFileName, &FileStatus) == OS_SUCCESS)
{
CFE_ES_SysLogWrite_Unsync("CFE_ES_ReloadApp: Reload Application %s Initiated. New filename = %s\n",
CFE_ES_SysLogWrite_Unsync("%s: Reload Application %s Initiated. New filename = %s\n", __func__,
CFE_ES_AppRecordGetName(AppRecPtr), AppFileName);
strncpy(AppRecPtr->StartParams.BasicInfo.FileName, AppFileName,
sizeof(AppRecPtr->StartParams.BasicInfo.FileName) - 1);
Expand All @@ -278,7 +278,7 @@ CFE_Status_t CFE_ES_ReloadApp(CFE_ES_AppId_t AppID, const char *AppFileName)
}
else
{
CFE_ES_SysLogWrite_Unsync("CFE_ES_ReloadApp: Cannot Reload Application %s, File %s does not exist.\n",
CFE_ES_SysLogWrite_Unsync("%s: Cannot Reload Application %s, File %s does not exist.\n", __func__,
CFE_ES_AppRecordGetName(AppRecPtr), AppFileName);
ReturnCode = CFE_ES_FILE_IO_ERR;
}
Expand Down Expand Up @@ -314,19 +314,19 @@ CFE_Status_t CFE_ES_DeleteApp(CFE_ES_AppId_t AppID)
*/
if (AppRecPtr->Type == CFE_ES_AppType_CORE)
{
CFE_ES_SysLogWrite_Unsync("CFE_ES_DeleteApp: Cannot Delete a CORE Application: %s.\n",
CFE_ES_SysLogWrite_Unsync("%s: Cannot Delete a CORE Application: %s.\n", __func__,
CFE_ES_AppRecordGetName(AppRecPtr));
ReturnCode = CFE_ES_ERR_RESOURCEID_NOT_VALID;
}
else if (AppRecPtr->AppState != CFE_ES_AppState_RUNNING)
{
CFE_ES_SysLogWrite_Unsync("CFE_ES_DeleteApp: Cannot Delete Application %s, It is not running.\n",
CFE_ES_SysLogWrite_Unsync("%s: Cannot Delete Application %s, It is not running.\n", __func__,
CFE_ES_AppRecordGetName(AppRecPtr));
ReturnCode = CFE_ES_ERR_RESOURCEID_NOT_VALID;
}
else
{
CFE_ES_SysLogWrite_Unsync("CFE_ES_DeleteApp: Delete Application %s Initiated\n",
CFE_ES_SysLogWrite_Unsync("%s: Delete Application %s Initiated\n", __func__,
CFE_ES_AppRecordGetName(AppRecPtr));
AppRecPtr->ControlReq.AppControlRequest = CFE_ES_RunStatus_SYS_DELETE;
}
Expand Down Expand Up @@ -358,7 +358,7 @@ void CFE_ES_ExitApp(uint32 ExitStatus)

if (ExitStatus == CFE_ES_RunStatus_UNDEFINED || ExitStatus >= CFE_ES_RunStatus_MAX)
{
CFE_ES_SysLogWrite_Unsync("CFE_ES_ExitApp: Called with invalid status (%u).\n", (unsigned int)ExitStatus);
CFE_ES_SysLogWrite_Unsync("%s: Called with invalid status (%u).\n", __func__, (unsigned int)ExitStatus);

/* revert to the ERROR status */
ExitStatus = CFE_ES_RunStatus_APP_ERROR;
Expand Down Expand Up @@ -392,7 +392,7 @@ void CFE_ES_ExitApp(uint32 ExitStatus)
*/
if (ExitStatus == CFE_ES_RunStatus_CORE_APP_INIT_ERROR)
{
CFE_ES_SysLogWrite_Unsync("CFE_ES_ExitApp: CORE Application %s Had an Init Error.\n",
CFE_ES_SysLogWrite_Unsync("%s: CORE Application %s Had an Init Error.\n", __func__,
CFE_ES_AppRecordGetName(AppRecPtr));

/*
Expand All @@ -417,7 +417,7 @@ void CFE_ES_ExitApp(uint32 ExitStatus)
}
else if (ExitStatus == CFE_ES_RunStatus_CORE_APP_RUNTIME_ERROR)
{
CFE_ES_SysLogWrite_Unsync("CFE_ES_ExitApp: CORE Application %s Had a Runtime Error.\n",
CFE_ES_SysLogWrite_Unsync("%s: CORE Application %s Had a Runtime Error.\n", __func__,
CFE_ES_AppRecordGetName(AppRecPtr));

/*
Expand All @@ -437,14 +437,14 @@ void CFE_ES_ExitApp(uint32 ExitStatus)
}
else
{
CFE_ES_SysLogWrite_Unsync("CFE_ES_ExitApp, Cannot Exit CORE Application %s\n",
CFE_ES_SysLogWrite_Unsync("%s: Cannot Exit CORE Application %s\n", __func__,
CFE_ES_AppRecordGetName(AppRecPtr));
}
}
else /* It is an external App */
{

CFE_ES_SysLogWrite_Unsync("Application %s called CFE_ES_ExitApp\n", CFE_ES_AppRecordGetName(AppRecPtr));
CFE_ES_SysLogWrite_Unsync("%s: Application %s called CFE_ES_ExitApp\n", __func__, CFE_ES_AppRecordGetName(AppRecPtr));

AppRecPtr->AppState = CFE_ES_AppState_STOPPED;

Expand Down Expand Up @@ -550,7 +550,7 @@ bool CFE_ES_RunLoop(uint32 *RunStatus)
/*
* Cannot do anything without the AppID
*/
CFE_ES_SysLogWrite_Unsync("CFE_ES_RunLoop Error: Cannot get AppID for the caller\n");
CFE_ES_SysLogWrite_Unsync("%s: Error getting AppID for the caller\n", __func__);
ReturnCode = false;

} /* end if Status == CFE_SUCCESS */
Expand Down Expand Up @@ -1124,7 +1124,7 @@ int32 CFE_ES_GetLibInfo(CFE_ES_AppInfo_t *LibInfo, CFE_ES_LibId_t LibId)
/*
* Log a message if called with an invalid ID.
*/
CFE_ES_SysLogWrite_Unsync("CFE_ES_GetLibInfo: Lib ID not active: %lu\n", CFE_RESOURCEID_TO_ULONG(LibId));
CFE_ES_SysLogWrite_Unsync("%s: Lib ID not active: %lu\n", __func__, CFE_RESOURCEID_TO_ULONG(LibId));

Status = CFE_ES_ERR_RESOURCEID_NOT_VALID;
}
Expand Down Expand Up @@ -1219,7 +1219,7 @@ CFE_Status_t CFE_ES_GetTaskInfo(CFE_ES_TaskInfo_t *TaskInfo, CFE_ES_TaskId_t Tas
{
/* task ID is bad */
Status = CFE_ES_ERR_RESOURCEID_NOT_VALID;
CFE_ES_SysLogWrite_Unsync("CFE_ES_GetTaskInfo: Task ID Not Active: %lu\n", CFE_RESOURCEID_TO_ULONG(TaskId));
CFE_ES_SysLogWrite_Unsync("%s: Task ID Not Active: %lu\n", __func__, CFE_RESOURCEID_TO_ULONG(TaskId));
}
else
{
Expand Down Expand Up @@ -1332,13 +1332,13 @@ CFE_Status_t CFE_ES_CreateChildTask(CFE_ES_TaskId_t *TaskIdPtr, const char *Task
AppRecPtr = CFE_ES_GetAppRecordByContext();
if (AppRecPtr == NULL)
{
CFE_ES_SysLogWrite_Unsync("CFE_ES_CreateChildTask: Invalid calling context when creating Task '%s'\n",
CFE_ES_SysLogWrite_Unsync("%s: Invalid calling context when creating Task '%s'\n", __func__,
TaskName);
ReturnCode = CFE_ES_ERR_RESOURCEID_NOT_VALID;
}
else if (!CFE_RESOURCEID_TEST_EQUAL(SelfTaskId, AppRecPtr->MainTaskId))
{
CFE_ES_SysLogWrite_Unsync("CFE_ES_CreateChildTask: Error: Cannot call from a Child Task (for Task '%s').\n",
CFE_ES_SysLogWrite_Unsync("%s: Error: Cannot call from a Child Task (for Task '%s').\n", __func__,
TaskName);
ReturnCode = CFE_ES_ERR_CHILD_TASK_CREATE;
}
Expand Down Expand Up @@ -1466,14 +1466,14 @@ CFE_Status_t CFE_ES_DeleteChildTask(CFE_ES_TaskId_t TaskId)
/*
** Report the task delete
*/
CFE_ES_SysLogWrite_Unsync("CFE_ES_DeleteChildTask Task %lu Deleted\n",
CFE_ES_SysLogWrite_Unsync("%s: Task %lu Deleted\n", __func__,
CFE_RESOURCEID_TO_ULONG(TaskId));
ReturnCode = CFE_SUCCESS;
}
else
{
CFE_ES_SysLogWrite_Unsync(
"CFE_ES_DeleteChildTask Error: Error Calling OS_TaskDelete: Task %lu, RC = 0x%08X\n",
"%s: Error Calling OS_TaskDelete: Task %lu, RC = 0x%08X\n", __func__,
CFE_RESOURCEID_TO_ULONG(TaskId), (unsigned int)OSReturnCode);
ReturnCode = CFE_ES_ERR_CHILD_TASK_DELETE;
}
Expand All @@ -1483,7 +1483,7 @@ CFE_Status_t CFE_ES_DeleteChildTask(CFE_ES_TaskId_t TaskId)
/*
** Error: The task is a cFE Application Main task
*/
CFE_ES_SysLogWrite_Unsync("CFE_ES_DeleteChildTask Error: Task %lu is a cFE Main Task.\n",
CFE_ES_SysLogWrite_Unsync("%s: Error: Task %lu is a cFE Main Task.\n", __func__,
CFE_RESOURCEID_TO_ULONG(TaskId));
ReturnCode = CFE_ES_ERR_CHILD_TASK_DELETE_MAIN_TASK;
} /* end if TaskMain == false */
Expand All @@ -1493,7 +1493,7 @@ CFE_Status_t CFE_ES_DeleteChildTask(CFE_ES_TaskId_t TaskId)
/*
** Task ID is not in use, so it is invalid
*/
CFE_ES_SysLogWrite_Unsync("CFE_ES_DeleteChildTask Error: Task ID is not active: %lu\n",
CFE_ES_SysLogWrite_Unsync("%s: Error: Task ID is not active: %lu\n", __func__,
CFE_RESOURCEID_TO_ULONG(TaskId));
ReturnCode = CFE_ES_ERR_RESOURCEID_NOT_VALID;

Expand Down Expand Up @@ -1558,13 +1558,13 @@ void CFE_ES_ExitChildTask(void)
}
else
{
CFE_ES_SysLogWrite_Unsync("CFE_ES_ExitChildTask Error: Cannot Call from a cFE App Main Task. ID = %lu\n",
CFE_ES_SysLogWrite_Unsync("%s: Error: Cannot Call from a cFE App Main Task. ID = %lu\n", __func__,
CFE_RESOURCEID_TO_ULONG(CFE_ES_TaskRecordGetID(TaskRecPtr)));
}
}
else
{
CFE_ES_SysLogWrite_Unsync("CFE_ES_ExitChildTask called from invalid task context\n");
CFE_ES_SysLogWrite_Unsync("%s: Called from invalid task context\n", __func__);
} /* end if GetAppId */

CFE_ES_UnlockSharedData(__func__, __LINE__);
Expand Down Expand Up @@ -1922,7 +1922,7 @@ CFE_Status_t CFE_ES_RegisterGenCounter(CFE_ES_CounterId_t *CounterIdPtr, const c
CountRecPtr = CFE_ES_LocateCounterRecordByName(CounterName);
if (CountRecPtr != NULL)
{
CFE_ES_SysLogWrite_Unsync("ES Startup: Duplicate Counter name '%s'\n", CounterName);
CFE_ES_SysLogWrite_Unsync("%s: Duplicate Counter name '%s'\n", __func__, CounterName);
Status = CFE_ES_ERR_DUPLICATE_NAME;
PendingResourceId = CFE_RESOURCEID_UNDEFINED;
}
Expand All @@ -1935,7 +1935,7 @@ CFE_Status_t CFE_ES_RegisterGenCounter(CFE_ES_CounterId_t *CounterIdPtr, const c

if (CountRecPtr == NULL)
{
CFE_ES_SysLogWrite_Unsync("ES Startup: No free Counter slots available\n");
CFE_ES_SysLogWrite_Unsync("%s: No free Counter slots available\n", __func__);
Status = CFE_ES_NO_RESOURCE_IDS_AVAILABLE;
}
else
Expand Down Expand Up @@ -2226,7 +2226,7 @@ void CFE_ES_LockSharedData(const char *FunctionName, int32 LineNumber)
* NOTE: this is going to write into a buffer that itself
* is _supposed_ to be protected by this same mutex.
*/
CFE_ES_SysLogWrite_Unsync("ES SharedData Mutex Take Err Stat=0x%x,Func=%s,Line=%d\n", (unsigned int)Status,
CFE_ES_SysLogWrite_Unsync("%s: SharedData Mutex Take Err Stat=0x%x,Func=%s,Line=%d\n", __func__, (unsigned int)Status,
FunctionName, (int)LineNumber);

} /* end if */
Expand All @@ -2253,7 +2253,7 @@ void CFE_ES_UnlockSharedData(const char *FunctionName, int32 LineNumber)
* NOTE: this is going to write into a buffer that itself
* is _supposed_ to be protected by this same mutex.
*/
CFE_ES_SysLogWrite_Unsync("ES SharedData Mutex Give Err Stat=0x%x,Func=%s,Line=%d\n", (unsigned int)Status,
CFE_ES_SysLogWrite_Unsync("%s: SharedData Mutex Give Err Stat=0x%x,Func=%s,Line=%d\n", __func__, (unsigned int)Status,
FunctionName, (int)LineNumber);

} /* end if */
Expand Down
16 changes: 8 additions & 8 deletions modules/es/fsw/src/cfe_es_apps.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ int32 CFE_ES_StartAppTask(CFE_ES_TaskId_t *TaskIdPtr, const char *TaskName, CFE_
TaskRecPtr = CFE_ES_LocateTaskRecordByID(LocalTaskId);
if (CFE_ES_TaskRecordIsUsed(TaskRecPtr))
{
CFE_ES_SysLogWrite_Unsync("ES Startup: Error: ES_TaskTable slot for ID %lx in use at task creation!\n",
CFE_ES_SysLogWrite_Unsync("%s: Error: ES_TaskTable slot for ID %lx in use at task creation!\n", __func__,
OS_ObjectIdToInteger(OsalTaskId));
}

Expand Down Expand Up @@ -638,7 +638,7 @@ int32 CFE_ES_StartAppTask(CFE_ES_TaskId_t *TaskIdPtr, const char *TaskName, CFE_
}
else
{
CFE_ES_SysLogWrite_Unsync("ES Startup: AppCreate Error: TaskCreate %s Failed. EC = 0x%08X!\n", TaskName,
CFE_ES_SysLogWrite_Unsync("%s: AppCreate Error: TaskCreate %s Failed. EC = 0x%08X!\n", __func__, TaskName,
(unsigned int)StatusCode);
ReturnCode = CFE_STATUS_EXTERNAL_RESOURCE_FAIL;
*TaskIdPtr = CFE_ES_TASKID_UNDEFINED;
Expand Down Expand Up @@ -703,7 +703,7 @@ int32 CFE_ES_AppCreate(CFE_ES_AppId_t *ApplicationIdPtr, const char *AppName, co
AppRecPtr = CFE_ES_LocateAppRecordByName(AppName);
if (AppRecPtr != NULL)
{
CFE_ES_SysLogWrite_Unsync("ES Startup: Duplicate app name '%s'\n", AppName);
CFE_ES_SysLogWrite_Unsync("%s: Duplicate app name '%s'\n", __func__, AppName);
Status = CFE_ES_ERR_DUPLICATE_NAME;
}
else
Expand All @@ -715,7 +715,7 @@ int32 CFE_ES_AppCreate(CFE_ES_AppId_t *ApplicationIdPtr, const char *AppName, co

if (AppRecPtr == NULL)
{
CFE_ES_SysLogWrite_Unsync("ES Startup: No free application slots available\n");
CFE_ES_SysLogWrite_Unsync("%s: No free application slots available\n", __func__);
Status = CFE_ES_NO_RESOURCE_IDS_AVAILABLE;
}
else
Expand Down Expand Up @@ -871,7 +871,7 @@ int32 CFE_ES_LoadLibrary(CFE_ES_LibId_t *LibraryIdPtr, const char *LibName, cons
LibSlotPtr = CFE_ES_LocateLibRecordByName(LibName);
if (LibSlotPtr != NULL || CFE_ES_LocateAppRecordByName(LibName) != NULL)
{
CFE_ES_SysLogWrite_Unsync("ES Startup: Duplicate Lib name '%s'\n", LibName);
CFE_ES_SysLogWrite_Unsync("%s: Duplicate Lib name '%s'\n", __func__, LibName);
if (LibSlotPtr != NULL)
{
PendingResourceId = CFE_RESOURCEID_UNWRAP(CFE_ES_LibRecordGetID(LibSlotPtr));
Expand All @@ -887,7 +887,7 @@ int32 CFE_ES_LoadLibrary(CFE_ES_LibId_t *LibraryIdPtr, const char *LibName, cons

if (LibSlotPtr == NULL)
{
CFE_ES_SysLogWrite_Unsync("ES Startup: No free library slots available\n");
CFE_ES_SysLogWrite_Unsync("%s: No free library slots available\n", __func__);
Status = CFE_ES_NO_RESOURCE_IDS_AVAILABLE;
}
else
Expand Down Expand Up @@ -1421,7 +1421,7 @@ int32 CFE_ES_CleanUpApp(CFE_ES_AppId_t AppId)
}
else
{
CFE_ES_SysLogWrite_Unsync("CFE_ES_CleanUpApp: AppID %lu is not valid for deletion\n",
CFE_ES_SysLogWrite_Unsync("%s: AppID %lu is not valid for deletion\n", __func__,
CFE_RESOURCEID_TO_ULONG(AppId));
ReturnCode = CFE_ES_APP_CLEANUP_ERR;
}
Expand Down Expand Up @@ -1626,7 +1626,7 @@ void CFE_ES_CleanupObjectCallback(osal_id_t ObjectId, void *arg)
}
else
{
CFE_ES_SysLogWrite_Unsync("Call to OSAL Delete Object (ID:%lu) failed. RC=0x%08X\n",
CFE_ES_SysLogWrite_Unsync("%s: Call to OSAL Delete Object (ID:%lu) failed. RC=0x%08X\n", __func__,
OS_ObjectIdToInteger(ObjectId), (unsigned int)Status);
if (CleanState->OverallStatus == CFE_SUCCESS)
{
Expand Down
2 changes: 1 addition & 1 deletion modules/es/fsw/src/cfe_es_cds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ int32 CFE_ES_CDS_EarlyInit(void)
Status = OS_MutSemCreate(&CDS->GenMutex, CFE_ES_CDS_MUT_REG_NAME, CFE_ES_CDS_MUT_REG_VALUE);
if (Status != OS_SUCCESS)
{
CFE_ES_SysLogWrite_Unsync("CFE_ES_CDS_EarlyInit: Failed to create mutex with error %d\n", (int)Status);
CFE_ES_SysLogWrite_Unsync("%s: Failed to create mutex with error %d\n", __func__, (int)Status);
return CFE_STATUS_EXTERNAL_RESOURCE_FAIL;
}

Expand Down
4 changes: 2 additions & 2 deletions modules/es/fsw/src/cfe_es_cds_mempool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ int32 CFE_ES_CreateCDSPool(size_t CDSPoolSize, size_t StartOffset)
if (ActualSize < SizeCheck)
{
/* Must be able make Pool verification, block descriptor and at least one of the smallest blocks */
CFE_ES_SysLogWrite_Unsync("CFE_ES:CreateCDSPool-Pool size(%lu) too small for one CDS Block, need >=%lu\n",
CFE_ES_SysLogWrite_Unsync("%s: Pool size(%lu) too small for one CDS Block, need >=%lu\n", __func__,
(unsigned long)ActualSize, (unsigned long)SizeCheck);
return CFE_ES_CDS_INVALID_SIZE;
}
Expand Down Expand Up @@ -163,7 +163,7 @@ int32 CFE_ES_RebuildCDSPool(size_t CDSPoolSize, size_t StartOffset)

if (Status != CFE_SUCCESS)
{
CFE_ES_SysLogWrite_Unsync("CFE_ES:RebuildCDS-Err rebuilding CDS (Stat=0x%08x)\n", (unsigned int)Status);
CFE_ES_SysLogWrite_Unsync("%s: Err rebuilding CDS (Stat=0x%08x)\n", __func__, (unsigned int)Status);
Status = CFE_ES_CDS_ACCESS_ERROR;
}

Expand Down
2 changes: 1 addition & 1 deletion modules/es/fsw/src/cfe_es_mempool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ CFE_Status_t CFE_ES_PoolCreateEx(CFE_ES_MemHandle_t *PoolID, void *MemPtr, size_

if (PoolRecPtr == NULL)
{
CFE_ES_SysLogWrite_Unsync("ES Startup: No free MemPoolrary slots available\n");
CFE_ES_SysLogWrite_Unsync("%s: No free MemPoolrary slots available\n", __func__);
Status = CFE_ES_NO_RESOURCE_IDS_AVAILABLE;
}
else
Expand Down
Loading

0 comments on commit 306593b

Please sign in to comment.