Skip to content

Commit 7f0895e

Browse files
committed
Fix #2794, Replace zero values for pointers with NULL
1 parent 39d765f commit 7f0895e

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

modules/es/fsw/src/cfe_es_apps.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ int32 CFE_ES_GetTaskFunction(CFE_ES_TaskEntryFuncPtr_t *FuncPtr)
579579
if (TaskRecPtr != NULL)
580580
{
581581
EntryFunc = TaskRecPtr->EntryFunc;
582-
if (CFE_RESOURCEID_TEST_DEFINED(TaskRecPtr->AppId) && EntryFunc != 0)
582+
if (CFE_RESOURCEID_TEST_DEFINED(TaskRecPtr->AppId) && EntryFunc != NULL)
583583
{
584584
ReturnCode = CFE_SUCCESS;
585585
}

modules/es/fsw/src/cfe_es_generic_pool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ int32 CFE_ES_GenPoolRebuild(CFE_ES_GenPoolRecord_t *PoolRecPtr)
550550
/* Test if block is deallocated */
551551
BucketId = BdPtr->Allocated - CFE_ES_MEMORY_DEALLOCATED;
552552
BucketPtr = CFE_ES_GenPoolGetBucketState(PoolRecPtr, BucketId);
553-
if (BucketPtr != 0)
553+
if (BucketPtr != NULL)
554554
{
555555
IsDeallocatedBlock = true;
556556
}

modules/es/fsw/src/cfe_es_mempool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
& ((struct { \
5353
char Byte; \
5454
type Align; \
55-
} *)0) \
55+
} *)NULL) \
5656
->Align)
5757

5858
/*****************************************************************************/

modules/sb/fsw/src/cfe_sb_util.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void *CFE_SB_GetUserData(CFE_MSG_Message_t *MsgPtr)
4949
if (MsgPtr == NULL)
5050
{
5151
CFE_ES_WriteToSysLog("%s: Failed invalid arguments\n", __func__);
52-
return 0;
52+
return NULL;
5353
}
5454

5555
BytePtr = (uint8 *)MsgPtr;

modules/tbl/fsw/src/cfe_tbl_dispatch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ const CFE_TBL_CmdHandlerTblRec_t CFE_TBL_CmdHandlerTbl[] = {
121121
CFE_TBL_CMD_MSGTYPE),
122122

123123
/* list terminator (keep last) */
124-
{ 0, 0, 0, NULL, CFE_TBL_TERM_MSGTYPE }
124+
{ NULL, 0, 0, NULL, CFE_TBL_TERM_MSGTYPE }
125125
};
126126

127127
/******************************************************************************/

0 commit comments

Comments
 (0)