Merge pull request #28 from nasa/ic-20200121

Integration Candidate 20200121
nasa · Jan 27, 2020 · f1acbd9 · f1acbd9
2 parents bdbd60a + 4742800
commit f1acbd9
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/fsw/src/sch_lab_app.c b/fsw/src/sch_lab_app.c
@@ -71,7 +71,8 @@ void SCH_Lab_AppMain(void)
     Status = SCH_LAB_AppInit();
     if ( Status != CFE_SUCCESS )
     {
-        CFE_ES_WriteToSysLog("SCHEULE APP: Error Initializing RC = 0x%08X\n", Status);
+        CFE_ES_WriteToSysLog("SCH_LAB: Error Initializing RC = 0x%08lX\n",
+                (unsigned long)Status);
 
     } 
 
@@ -81,7 +82,8 @@ void SCH_Lab_AppMain(void)
     Status = CFE_TBL_Manage(TblHandles);  
     if ( Status != CFE_SUCCESS )
     {
-        CFE_ES_WriteToSysLog("SCHEULE APP: Error managing table  RC = 0x%08X\n", Status);
+        CFE_ES_WriteToSysLog("SCH_LAB: Error managing table  RC = 0x%08lX\n",
+                (unsigned long)Status);
         CFE_TBL_ReleaseAddress(TblHandles);
 
     }  
@@ -128,8 +130,8 @@ void SCH_Lab_AppMain(void)
     Status = CFE_TBL_ReleaseAddress(TblHandles);
     if ( Status != CFE_SUCCESS )
     {
-        CFE_ES_WriteToSysLog("SCHEULE APP: Error Releasing Table \
-                              SCH_LAB_SchTbl, RC = 0x%08X\n", Status);
+        CFE_ES_WriteToSysLog("SCH_LAB: Error Releasing Table SCH_LAB_SchTbl, RC = 0x%08lX\n",
+                              (unsigned long)Status);
 
     }
 
@@ -157,8 +159,8 @@ int32 SCH_LAB_AppInit(void)
                               &SCH_LAB_TblValidation);
     if ( Status != CFE_SUCCESS )
     {
-        CFE_ES_WriteToSysLog("SCHEULE APP: Error Registering \
-                              SCH_LAB_SchTbl, RC = 0x%08X\n", Status);
+        CFE_ES_WriteToSysLog("SCH_LAB: Error Registering SCH_LAB_SchTbl, RC = 0x%08lX\n",
+                (unsigned long)Status);
 
         return ( Status );
     }
@@ -170,8 +172,8 @@ int32 SCH_LAB_AppInit(void)
         Status = CFE_TBL_Load(TblHandles, CFE_TBL_SRC_FILE, SCH_TBL_DEFAULT_FILE);
         if ( Status != CFE_SUCCESS )
         {
-            CFE_ES_WriteToSysLog("SCHEULE APP: Error Loading Table \
-                                  SCH_LAB_SchTbl, RC = 0x%08X\n", Status);
+            CFE_ES_WriteToSysLog("SCH_LAB: Error Loading Table SCH_LAB_SchTbl, RC = 0x%08lX\n",
+                    (unsigned long)Status);
             CFE_TBL_ReleaseAddress(TblHandles);
 
             return ( Status );
@@ -182,10 +184,11 @@ int32 SCH_LAB_AppInit(void)
     ** Get Table Address
     */ 
     Status = CFE_TBL_GetAddress((void **)&MySchTBL, TblHandles);
-    if ( Status != CFE_TBL_INFO_UPDATED )
+    if ( Status != CFE_SUCCESS &&
+         Status != CFE_TBL_INFO_UPDATED )
     {
-        CFE_ES_WriteToSysLog("SCHEULE APP: Error Getting Table's Address \
-                              SCH_LAB_SchTbl, RC = 0x%08X\n", Status);
+        CFE_ES_WriteToSysLog("SCH_LAB: Error Getting Table's Address SCH_LAB_SchTbl, RC = 0x%08lX\n",
+                (unsigned long)Status);
 
         return ( Status );
     }