Merge pull request #1332 from nasa/integration-candidate

osal Integration candidate: Caelum-rc4+dev28
nasa · Nov 14, 2022 · e98bb23 · e98bb23
2 parents 4567e8b + 8ca317e
commit e98bb23
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: v6.0.0-rc4+dev151
+- add BUGCHECK_VOID macro
+- See <https://github.com/nasa/osal/pull/1323>
+
 ## Development Build: v6.0.0-rc4+dev147
 - adjust timing on condvar tests
 - See <https://github.com/nasa/osal/pull/1319>

diff --git a/src/os/inc/osapi-macros.h b/src/os/inc/osapi-macros.h
@@ -136,4 +136,13 @@
  */
 #define LENGTHCHECK(str, len, errcode) ARGCHECK(memchr(str, '\0', len), errcode)
 
+/**
+ * @brief Bug-Check macro for void functions
+ *
+ * The basic BUGCHECK macro returns a value, which needs to be empty
+ * for functions that do not have a return value.  In this case the
+ * second argument (errcode) is intentionally left blank.
+ */
+#define BUGCHECK_VOID(cond) BUGCHECK(cond, )
+
 #endif /* OSAPI_MACROS_H */
diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h
@@ -34,7 +34,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define OS_BUILD_NUMBER   147
+#define OS_BUILD_NUMBER   151
 #define OS_BUILD_BASELINE "v6.0.0-rc4"
 
 /*

diff --git a/src/os/shared/src/osapi-printf.c b/src/os/shared/src/osapi-printf.c
@@ -266,7 +266,7 @@ void OS_printf(const char *String, ...)
     char    msg_buffer[OS_BUFFER_SIZE];
     int     actualsz;
 
-    BUGCHECK((String) != NULL, )
+    BUGCHECK_VOID(String != NULL)
 
     if (OS_SharedGlobalVars.GlobalState != OS_INIT_MAGIC_NUMBER)
     {