From dfe8abce8925fe147d8b650a9c2012c11266eea6 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Wed, 2 Sep 2020 11:18:36 -0400 Subject: [PATCH] Fix #797, Update FS subsystem for abstract IDs Minor fixup for use of IDs when logging --- fsw/cfe-core/src/fs/cfe_fs_priv.c | 8 ++++---- fsw/cfe-core/unit-test/fs_UT.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fsw/cfe-core/src/fs/cfe_fs_priv.c b/fsw/cfe-core/src/fs/cfe_fs_priv.c index b4d59ac66..0ec0415f3 100644 --- a/fsw/cfe-core/src/fs/cfe_fs_priv.c +++ b/fsw/cfe-core/src/fs/cfe_fs_priv.c @@ -99,8 +99,8 @@ void CFE_FS_LockSharedData(const char *FunctionName) { CFE_ES_GetAppID(&AppId); - CFE_ES_WriteToSysLog("FS SharedData Mutex Take Err Stat=0x%x,App=%d,Function=%s\n", - (unsigned int)Status,(int)AppId,FunctionName); + CFE_ES_WriteToSysLog("FS SharedData Mutex Take Err Stat=0x%x,App=%lu,Function=%s\n", + (unsigned int)Status,CFE_ES_ResourceID_ToInteger(AppId),FunctionName); }/* end if */ @@ -130,8 +130,8 @@ void CFE_FS_UnlockSharedData(const char *FunctionName) if (Status != OS_SUCCESS) { CFE_ES_GetAppID(&AppId); - CFE_ES_WriteToSysLog("FS SharedData Mutex Give Err Stat=0x%x,App=%d,Function=%s\n", - (unsigned int)Status,(int)AppId,FunctionName); + CFE_ES_WriteToSysLog("FS SharedData Mutex Give Err Stat=0x%x,App=%lu,Function=%s\n", + (unsigned int)Status,CFE_ES_ResourceID_ToInteger(AppId),FunctionName); }/* end if */ return; diff --git a/fsw/cfe-core/unit-test/fs_UT.c b/fsw/cfe-core/unit-test/fs_UT.c index 16411ea32..83080eb02 100644 --- a/fsw/cfe-core/unit-test/fs_UT.c +++ b/fsw/cfe-core/unit-test/fs_UT.c @@ -43,8 +43,8 @@ const char *FS_SYSLOG_MSGS[] = { NULL, - "FS SharedData Mutex Take Err Stat=0x%x,App=%d,Function=%s\n", - "FS SharedData Mutex Give Err Stat=0x%x,App=%d,Function=%s\n" + "FS SharedData Mutex Take Err Stat=0x%x,App=%lu,Function=%s\n", + "FS SharedData Mutex Give Err Stat=0x%x,App=%lu,Function=%s\n" }; /*