Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Fix #1705, correct return code mismatches #1706

Merged
merged 1 commit into from
Jul 29, 2021
Merged

Fix #1705, correct return code mismatches #1706

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
4 changes: 2 additions & 2 deletions modules/cfe_assert/src/cfe_assert_io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ void UT_BSP_Lock(void)
int32 rc;

rc = OS_MutSemTake(CFE_Assert_Global.AccessMutex);
if (rc != CFE_SUCCESS)
if (rc != OS_SUCCESS)
{
CFE_ES_WriteToSysLog("%s(): Error from OS_MutSemTake(): %d\n", __func__, (int)rc);
}
Expand All @@ -54,7 +54,7 @@ void UT_BSP_Unlock(void)
int32 rc;

rc = OS_MutSemGive(CFE_Assert_Global.AccessMutex);
if (rc != CFE_SUCCESS)
if (rc != OS_SUCCESS)
{
CFE_ES_WriteToSysLog("%s(): Error from OS_MutSemGive(): %d\n", __func__, (int)rc);
}
Expand Down
2 changes: 1 addition & 1 deletion modules/es/fsw/src/cfe_es_backgroundtask.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ int32 CFE_ES_BackgroundInit(void)
CFE_ES_BACKGROUND_CHILD_STACK_SIZE, CFE_ES_BACKGROUND_CHILD_PRIORITY,
CFE_ES_BACKGROUND_CHILD_FLAGS);

if (status != OS_SUCCESS)
if (status != CFE_SUCCESS)
{
CFE_ES_WriteToSysLog("%s: Failed to create background task: %08lx\n", __func__, (unsigned long)status);
return status;
Expand Down
6 changes: 3 additions & 3 deletions modules/es/fsw/src/cfe_es_cds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ int32 CFE_ES_ValidateCDS(void)
/* Perform 2 checks to validate the CDS Memory Pool */
/* First, determine if the first validity check field is correct */
Status = CFE_ES_CDS_CacheFetch(&CDS->Cache, CDS_SIG_BEGIN_OFFSET, SIG_CDS_SIZE);
if (Status != CFE_PSP_SUCCESS)
if (Status != CFE_SUCCESS)
{
CFE_ES_WriteToSysLog("%s: 1st ReadFromCDS Failed. Status=0x%X\n", __func__, (unsigned int)Status);
return Status;
Expand All @@ -504,7 +504,7 @@ int32 CFE_ES_ValidateCDS(void)
TrailerOffset -= sizeof(CFE_ES_CDS_PersistentTrailer_t);

Status = CFE_ES_CDS_CacheFetch(&CDS->Cache, TrailerOffset, SIG_CDS_SIZE);
if (Status != CFE_PSP_SUCCESS)
if (Status != CFE_SUCCESS)
{
/* BSP reported an error reading from CDS */
CFE_ES_WriteToSysLog("%s: 2nd ReadFromCDS Failed. Status=0x%X\n", __func__, (unsigned int)Status);
Expand Down Expand Up @@ -599,7 +599,7 @@ int32 CFE_ES_InitCDSSignatures(void)

CFE_ES_CDS_CachePreload(&CDS->Cache, CFE_ES_CDS_SIGNATURE_END, SigOffset, CFE_ES_CDS_SIGNATURE_LEN);
Status = CFE_ES_CDS_CacheFlush(&CDS->Cache);
if (Status != CFE_PSP_SUCCESS)
if (Status != CFE_SUCCESS)
{
CFE_ES_WriteToSysLog("%s: '_CDSEnd_' write failed. Status=0x%08X\n", __func__,
(unsigned int)CDS->Cache.AccessStatus);
Expand Down
2 changes: 1 addition & 1 deletion modules/es/fsw/src/cfe_es_task.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1998,7 +1998,7 @@ int32 CFE_ES_DumpCDSRegistryCmd(const CFE_ES_DumpCDSRegistryCmd_t *data)
CFE_FS_GetDefaultMountPoint(CFE_FS_FileCategory_BINARY_DATA_DUMP),
CFE_FS_GetDefaultExtension(CFE_FS_FileCategory_BINARY_DATA_DUMP));

if (Status != OS_SUCCESS)
if (Status != CFE_SUCCESS)
{
CFE_EVS_SendEvent(CFE_ES_CREATING_CDS_DUMP_ERR_EID, CFE_EVS_EventType_ERROR,
"Error parsing CDS dump filename, Status=0x%08X", (unsigned int)Status);
Expand Down
2 changes: 1 addition & 1 deletion modules/evs/fsw/src/cfe_evs_log.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ int32 CFE_EVS_WriteLogDataFileCmd(const CFE_EVS_WriteLogDataFileCmd_t *data)
CFE_FS_GetDefaultMountPoint(CFE_FS_FileCategory_BINARY_DATA_DUMP),
CFE_FS_GetDefaultExtension(CFE_FS_FileCategory_BINARY_DATA_DUMP));

if (Result != OS_SUCCESS)
if (Result != CFE_SUCCESS)
{
EVS_SendEvent(CFE_EVS_ERR_CRLOGFILE_EID, CFE_EVS_EventType_ERROR,
"Write Log File Command Error: CFE_FS_ParseInputFileNameEx() = 0x%08X", (unsigned int)Result);
Expand Down
4 changes: 2 additions & 2 deletions modules/time/fsw/src/cfe_time_task.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,15 @@ int32 CFE_TIME_TaskInit(void)

Status = OS_BinSemCreate(&CFE_TIME_Global.ToneSemaphore, CFE_TIME_SEM_TONE_NAME, CFE_TIME_SEM_VALUE,
CFE_TIME_SEM_OPTIONS);
if (Status != CFE_SUCCESS)
if (Status != OS_SUCCESS)
{
CFE_ES_WriteToSysLog("%s: Error creating tone semaphore:RC=0x%08X\n", __func__, (unsigned int)Status);
return Status;
} /* end if */

Status = OS_BinSemCreate(&CFE_TIME_Global.LocalSemaphore, CFE_TIME_SEM_1HZ_NAME, CFE_TIME_SEM_VALUE,
CFE_TIME_SEM_OPTIONS);
if (Status != CFE_SUCCESS)
if (Status != OS_SUCCESS)
{
CFE_ES_WriteToSysLog("%s: Error creating local semaphore:RC=0x%08X\n", __func__, (unsigned int)Status);
return Status;
Expand Down