Fix nasa#797, Update FS subsystem for abstract IDs

Minor fixup for use of IDs when logging
jphickey · Sep 2, 2020 · dfe8abc · dfe8abc
1 parent 2efe70b
commit dfe8abc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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"
 };
 
 /*