Merge branch 'fix-1141-fixup-debug-event' into jph-wip-baseline-20210201

jphickey · jphickey · commit c87adc4dde9c · 2021-02-01T14:48:31.000-05:00
diff --git a/fsw/cfe-core/src/sb/cfe_sb_api.c b/fsw/cfe-core/src/sb/cfe_sb_api.c
@@ -1143,9 +1143,9 @@ int32  CFE_SB_SubscribeFull(CFE_SB_MsgId_t   MsgId,
     {
         /* If no other event pending, send a debug event indicating success */
         CFE_EVS_SendEventWithAppID(CFE_SB_SUBSCRIPTION_RCVD_EID,CFE_EVS_EventType_DEBUG,CFE_SB.AppId,
-            "Subscription Rcvd:MsgId 0x%x on %s(%lu),app %s",
+            "Subscription Rcvd:MsgId 0x%x on PipeId %lu,app %s",
             (unsigned int)CFE_SB_MsgIdToValue(MsgId),
-            PipeName,CFE_RESOURCEID_TO_ULONG(PipeId),CFE_SB_GetAppTskName(TskId,FullName));
+            CFE_RESOURCEID_TO_ULONG(PipeId),CFE_SB_GetAppTskName(TskId,FullName));
     }
 
     if (Status == CFE_SUCCESS && Scope == CFE_SB_GLOBAL)

Original file line number	Diff line number	Diff line change
`@@ -1143,9 +1143,9 @@ int32 CFE_SB_SubscribeFull(CFE_SB_MsgId_t MsgId,`
`1143`	`1143`	`{`
`1144`	`1144`	`/* If no other event pending, send a debug event indicating success */`
`1145`	`1145`	`CFE_EVS_SendEventWithAppID(CFE_SB_SUBSCRIPTION_RCVD_EID,CFE_EVS_EventType_DEBUG,CFE_SB.AppId,`
`1146`		`- "Subscription Rcvd:MsgId 0x%x on %s(%lu),app %s",`
	`1146`	`+ "Subscription Rcvd:MsgId 0x%x on PipeId %lu,app %s",`
`1147`	`1147`	`(unsigned int)CFE_SB_MsgIdToValue(MsgId),`
`1148`		`- PipeName,CFE_RESOURCEID_TO_ULONG(PipeId),CFE_SB_GetAppTskName(TskId,FullName));`
	`1148`	`+ CFE_RESOURCEID_TO_ULONG(PipeId),CFE_SB_GetAppTskName(TskId,FullName));`
`1149`	`1149`	`}`
`1150`	`1150`
`1151`	`1151`	`if (Status == CFE_SUCCESS && Scope == CFE_SB_GLOBAL)`