From a6cf564a85759d8de089f6c078fe5f6dec8d414c Mon Sep 17 00:00:00 2001
From: Joseph Hickey <joseph.p.hickey@nasa.gov>
Date: Tue, 7 Sep 2021 11:29:46 -0400
Subject: [PATCH 1/3] Fix #1141, add typecast to memchr call

This function is documented as returning `void*`, and on some compilers
this requires an explicit cast to `const char*` to avoid a warning.
---
 src/os/shared/inc/os-shared-common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/os/shared/inc/os-shared-common.h b/src/os/shared/inc/os-shared-common.h
index c6cb302fc..3de1a93ce 100644
--- a/src/os/shared/inc/os-shared-common.h
+++ b/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 */

From e68c8a9a4c9ed20f369f7d5d7bf9f1727154f31b Mon Sep 17 00:00:00 2001
From: Jacob Hageman <jacob.hageman@nasa.gov>
Date: Tue, 7 Sep 2021 20:55:53 +0000
Subject: [PATCH 2/3] Fix #1143, Regex update in coverage enforcement to match
 .0

---
 .github/workflows/local_unit_test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/local_unit_test.yml b/.github/workflows/local_unit_test.yml
index c5c89587f..ac7657da5 100644
--- a/.github/workflows/local_unit_test.yml
+++ b/.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"

From 1743a68709fe7f9ba910a27547af261c12aa17ff Mon Sep 17 00:00:00 2001
From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com>
Date: Thu, 9 Sep 2021 12:57:04 -0400
Subject: [PATCH 3/3] IC:2021-09-07, Bump to v5.1.0-rc1+dev604

Part of nasa/cFS#351
---
 README.md                  | 5 +++++
 src/os/inc/osapi-version.h | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8970e8baf..2d360b32e 100644
--- a/README.md
+++ b/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
diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h
index e91916b83..4e546f389 100644
--- a/src/os/inc/osapi-version.h
+++ b/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"
 
 /*