Merge pull request #226 from nasa/integration-candidate

cFS-GroundSystem Integration candidate: Caelum-rc4+dev23
nasa · Oct 3, 2022 · 32f361c · 32f361c
2 parents 072f6ad + 9a1e275
commit 32f361c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,12 @@ See [Guide-GroundSystem.md](https://github.com/nasa/cFS-GroundSystem/blob/master
 
 ## Version History
 
+
+### Development Build: v3.0.0-rc4+dev25
+
+- Remove 'return;' from last line of void functions.
+- See <https://github.com/nasa/cFS-GroundSystem/pull/222>
+
 ### Development Build: v3.0.0-rc4+dev19
 
 - Update Copyright Headers

diff --git a/Subsystems/cmdUtil/cmdUtil.c b/Subsystems/cmdUtil/cmdUtil.c
@@ -366,8 +366,6 @@ void ProcessField(uint16_t *orig, const char *in, const uint16_t mask, bool fiel
     }
 
     *orig = htobe16((be16toh(*orig) & ~mask) | (templong & mask));
-
-    return;
 }
 
 /******************************************************************************
@@ -387,8 +385,6 @@ void CopyData(unsigned char *pkt, unsigned int *startbyte, char *in, unsigned in
     /* Copy data into packet buffer and move start byte */
     memcpy(&pkt[*startbyte], in, nbytes);
     *startbyte += nbytes;
-
-    return;
 }
 
 /******************************************************************************

diff --git a/_version.py b/_version.py
@@ -17,7 +17,7 @@
 #
 
 # Development Build Macro Definitions
-_cFS_GrndSys_build_number = 19
+_cFS_GrndSys_build_number = 25
 _cFS_GrndSys_build_baseline = "v3.0.0-rc4"
 
 # Version Number Definitions see doxygen docs for definitions