From ee2bd9936bf8cc8168a5919a0b3607cbe61bae25 Mon Sep 17 00:00:00 2001 From: Avi Date: Thu, 27 Oct 2022 13:05:38 +1000 Subject: [PATCH] Fix #1456, Rename CFE_SB_RemovePipeCallback_t to ...backArgs_t --- modules/sb/fsw/src/cfe_sb_api.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/sb/fsw/src/cfe_sb_api.c b/modules/sb/fsw/src/cfe_sb_api.c index bc4280ece..b024bb148 100644 --- a/modules/sb/fsw/src/cfe_sb_api.c +++ b/modules/sb/fsw/src/cfe_sb_api.c @@ -73,7 +73,7 @@ typedef struct { const char * FullName; /* Full name (app.task) for error reporting */ CFE_SB_PipeId_t PipeId; /* Pipe id to remove */ -} CFE_SB_RemovePipeCallback_t; +} CFE_SB_RemovePipeCallbackArgs_t; /*---------------------------------------------------------------- * @@ -315,10 +315,10 @@ int32 CFE_SB_DeletePipeWithAppId(CFE_SB_PipeId_t PipeId, CFE_ES_AppId_t AppId) *-----------------------------------------------------------------*/ void CFE_SB_RemovePipeFromRoute(CFE_SBR_RouteId_t RouteId, void *ArgPtr) { - CFE_SB_DestinationD_t * destptr; - CFE_SB_RemovePipeCallback_t *args; + CFE_SB_DestinationD_t * destptr; + CFE_SB_RemovePipeCallbackArgs_t *args; - args = (CFE_SB_RemovePipeCallback_t *)ArgPtr; + args = (CFE_SB_RemovePipeCallbackArgs_t *)ArgPtr; destptr = CFE_SB_GetDestPtr(RouteId, args->PipeId); @@ -336,15 +336,15 @@ void CFE_SB_RemovePipeFromRoute(CFE_SBR_RouteId_t RouteId, void *ArgPtr) *-----------------------------------------------------------------*/ int32 CFE_SB_DeletePipeFull(CFE_SB_PipeId_t PipeId, CFE_ES_AppId_t AppId) { - CFE_SB_PipeD_t * PipeDscPtr; - int32 Status; - CFE_ES_TaskId_t TskId; - CFE_SB_BufferD_t * BufDscPtr; - osal_id_t SysQueueId; - char FullName[(OS_MAX_API_NAME * 2)]; - size_t BufDscSize; - CFE_SB_RemovePipeCallback_t Args; - uint16 PendingEventID; + CFE_SB_PipeD_t * PipeDscPtr; + int32 Status; + CFE_ES_TaskId_t TskId; + CFE_SB_BufferD_t * BufDscPtr; + osal_id_t SysQueueId; + char FullName[(OS_MAX_API_NAME * 2)]; + size_t BufDscSize; + CFE_SB_RemovePipeCallbackArgs_t Args; + uint16 PendingEventID; Status = CFE_SUCCESS; PendingEventID = 0;