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 #1971, avoid alias warning on some compilers #1972

Merged
merged 1 commit into from
Sep 22, 2021
Merged

Fix #1971, avoid alias warning on some compilers #1972

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
18 changes: 10 additions & 8 deletions modules/sb/fsw/src/cfe_sb_buf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,16 @@ void CFE_SB_TrackingListAdd(CFE_SB_BufferLink_t *List, CFE_SB_BufferLink_t *Node
*-----------------------------------------------------------------*/
CFE_SB_BufferD_t *CFE_SB_GetBufferFromPool(size_t MaxMsgSize)
{
int32 stat1;
size_t AllocSize;
CFE_SB_BufferD_t *bd = NULL;
int32 stat1;
size_t AllocSize;
CFE_ES_MemPoolBuf_t addr = NULL;
CFE_SB_BufferD_t * bd;

/* The allocation needs to include enough space for the descriptor object */
AllocSize = MaxMsgSize + CFE_SB_BUFFERD_CONTENT_OFFSET;

/* Allocate a new buffer descriptor from the SB memory pool.*/
stat1 = CFE_ES_GetPoolBuf((CFE_ES_MemPoolBuf_t *)&bd, CFE_SB_Global.Mem.PoolHdl, AllocSize);
stat1 = CFE_ES_GetPoolBuf(&addr, CFE_SB_Global.Mem.PoolHdl, AllocSize);
if (stat1 < 0)
{
return NULL;
Expand All @@ -134,6 +135,7 @@ CFE_SB_BufferD_t *CFE_SB_GetBufferFromPool(size_t MaxMsgSize)
} /* end if */

/* Initialize the buffer descriptor structure. */
bd = (CFE_SB_BufferD_t *)addr;
memset(bd, 0, CFE_SB_BUFFERD_CONTENT_OFFSET);

bd->MsgId = CFE_SB_INVALID_MSG_ID;
Expand Down Expand Up @@ -214,11 +216,11 @@ void CFE_SB_DecrBufUseCnt(CFE_SB_BufferD_t *bd)
*-----------------------------------------------------------------*/
CFE_SB_DestinationD_t *CFE_SB_GetDestinationBlk(void)
{
int32 Stat;
CFE_SB_DestinationD_t *Dest = NULL;
int32 Stat;
CFE_ES_MemPoolBuf_t addr = NULL;

/* Allocate a new destination descriptor from the SB memory pool.*/
Stat = CFE_ES_GetPoolBuf((CFE_ES_MemPoolBuf_t *)&Dest, CFE_SB_Global.Mem.PoolHdl, sizeof(CFE_SB_DestinationD_t));
Stat = CFE_ES_GetPoolBuf(&addr, CFE_SB_Global.Mem.PoolHdl, sizeof(CFE_SB_DestinationD_t));
if (Stat < 0)
{
return NULL;
Expand All @@ -232,7 +234,7 @@ CFE_SB_DestinationD_t *CFE_SB_GetDestinationBlk(void)
CFE_SB_Global.StatTlmMsg.Payload.PeakMemInUse = CFE_SB_Global.StatTlmMsg.Payload.MemInUse;
} /* end if */

return Dest;
return (CFE_SB_DestinationD_t *)addr;
}

/*----------------------------------------------------------------
Expand Down