Merge pull request nasa#2594 from nasa/integration-candidate

cFE Integration candidate: Equuleus-rc1+dev16
thnkslprpt · Aug 22, 2024 · 4763a7f · 4763a7f
2 parents dab2f42 + 9cf9939
commit 4763a7f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: equuleus-rc1+dev187
+- Use proper printf format for size_t
+- See <https://github.com/nasa/cFE/pull/2591>
+
 ## Development Build: equuleus-rc1+dev183
 - Runtime Error in coverage-es-ALL, TestApps
 - add config tool for platform-specific settings

diff --git a/modules/core_api/fsw/inc/cfe_version.h b/modules/core_api/fsw/inc/cfe_version.h
@@ -26,7 +26,7 @@
 #define CFE_VERSION_H
 
 /* Development Build Macro Definitions */
-#define CFE_BUILD_NUMBER    183 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
+#define CFE_BUILD_NUMBER    187 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
 #define CFE_BUILD_BASELINE  "equuleus-rc1" /**< @brief Development: Reference git tag for build number */
 #define CFE_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
 #define CFE_BUILD_CODENAME  "Equuleus"     /**< @brief: Development: Code name for the current build */

diff --git a/modules/sb/fsw/src/cfe_sb_api.c b/modules/sb/fsw/src/cfe_sb_api.c
@@ -1398,7 +1398,7 @@ CFE_SB_Buffer_t *CFE_SB_AllocateMessageBuffer(size_t MsgSize)
     if (MsgSize > CFE_MISSION_SB_MAX_SB_MSG_SIZE)
     {
         CFE_ES_GetAppName(AppName, AppId, sizeof(AppName));
-        CFE_ES_WriteToSysLog("%s %s: Failed, requested size %ld larger than allowed %d\n",
+        CFE_ES_WriteToSysLog("%s %s: Failed, requested size %zu larger than allowed %d\n",
                              AppName, __func__, MsgSize, CFE_MISSION_SB_MAX_SB_MSG_SIZE);
         return NULL;
     }