Merge pull request #124 from nasa/integration-candidate

sch_lab Integration candidate: Caelum-rc4+dev23
nasa · Oct 3, 2022 · 3b13636 · 3b13636
2 parents 0d1e430 + 442fb25
commit 3b13636
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -13,6 +13,10 @@ To change the list of packets that sch_lab sends out, edit the schedule table lo
 
 ## Version History
 
+### Development Build: v2.5.0-rc4:dev35
+- Remove unnecessary parentheses around return values.
+- See <https://github.com/nasa/sch_lab/pull/121>
+
 ### Development Build: v2.5.0-rc4+dev31
 - Update cmake mimimum required to something more recent
 - See <https://github.com/nasa/sch_lab/pull/118>

diff --git a/fsw/src/sch_lab_app.c b/fsw/src/sch_lab_app.c
@@ -199,7 +199,7 @@ int32 SCH_LAB_AppInit(void)
     {
         CFE_ES_WriteToSysLog("SCH_LAB: Error Registering SCH_LAB_SchTbl, RC = 0x%08lX\n", (unsigned long)Status);
 
-        return (Status);
+        return Status;
     }
     else
     {
@@ -212,7 +212,7 @@ int32 SCH_LAB_AppInit(void)
             CFE_ES_WriteToSysLog("SCH_LAB: Error Loading Table SCH_LAB_SchTbl, RC = 0x%08lX\n", (unsigned long)Status);
             CFE_TBL_ReleaseAddress(SCH_LAB_Global.TblHandle);
 
-            return (Status);
+            return Status;
         }
     }
 
@@ -225,7 +225,7 @@ int32 SCH_LAB_AppInit(void)
         CFE_ES_WriteToSysLog("SCH_LAB: Error Getting Table's Address SCH_LAB_SchTbl, RC = 0x%08lX\n",
                              (unsigned long)Status);
 
-        return (Status);
+        return Status;
     }
 
     /*
@@ -294,6 +294,6 @@ int32 SCH_LAB_AppInit(void)
 
     OS_printf("SCH Lab Initialized.%s\n", SCH_LAB_VERSION_STRING);
 
-    return (CFE_SUCCESS);
+    return CFE_SUCCESS;
 
 } /*End of AppInit*/
diff --git a/fsw/src/sch_lab_version.h b/fsw/src/sch_lab_version.h
@@ -25,7 +25,7 @@
  */
 
 /* Development Build Macro Definitions */
-#define SCH_LAB_BUILD_NUMBER 31 /*!< Development Build: Number of commits since baseline */
+#define SCH_LAB_BUILD_NUMBER 35 /*!< Development Build: Number of commits since baseline */
 #define SCH_LAB_BUILD_BASELINE \
     "v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */