Merge pull request #1145 from nasa/integration-candidate

osal Integration candidate: 2021-09-07

.github/workflows/local_unit_test.yml

@@ -44,10 +44,10 @@ jobs:
         run: |
           # Current best possible branch coverage is all but 4, with associated issues for each missing case
           missed_branches=4
-          coverage_nums=$(grep -A 3 "Overall coverage rate" lcov_out.txt | grep branches | grep -oP "[1-9]+[0-9]*")
+          coverage_nums=$(grep -A 3 "Overall coverage rate" lcov_out.txt | grep branches | grep -oP "[0-9]+[0-9]*")
 
           diff=$(echo $coverage_nums | awk '{ print $4 - $3 }')
-          if [ $(($diff > $missed_branches)) == 1 ]
+          if [ $diff -gt $missed_branches ]
           then 
             grep -A 3 "Overall coverage rate" lcov_out.txt
             echo "More than $missed_branches branches missed"

README.md

@@ -11,6 +11,11 @@ The autogenerated OSAL user's guide can be viewed at <https://github.com/nasa/cF
 
 ## Version History
 
+### Development Build: v5.1.0-rc1+dev604
+
+- Add typecast to memchr call
+- Regex update in coverage enforcement to match `.0`
+- See <https://github.com/nasa/osal/pull/1145> and <https://github.com/nasa/cFS/pull/351>
 ### Development Build: v5.1.0-rc1+dev598
 
 - Add UTAssert macros that help test bit field storage

src/os/inc/osapi-version.h

@@ -36,7 +36,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define OS_BUILD_NUMBER   598
+#define OS_BUILD_NUMBER   604
 #define OS_BUILD_BASELINE "v5.1.0-rc1"
 
 /*

src/os/shared/inc/os-shared-common.h

@@ -149,7 +149,7 @@ void OS_ApplicationShutdown_Impl(void);
  ------------------------------------------------------------------*/
 static inline size_t OS_strnlen(const char *s, size_t maxlen)
 {
-    const char *end = memchr(s, 0, maxlen);
+    const char *end = (const char *)memchr(s, 0, maxlen);
     if (end != NULL)
     {
         /* actual length of string is difference */