Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cFE Integration candidate: Equuleus-rc1+dev16 #2594

Merged
merged 3 commits into from
Aug 22, 2024
Merged

cFE Integration candidate: Equuleus-rc1+dev16 #2594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e6504d
Fix #2590, Use proper printf format for size_t
pepepr08 Aug 14, 2024
17a181c
Merge pull request #2591 from pepepr08:fix-2590-printf-size_t
dzbaker Aug 16, 2024
9cf9939
Updating documentation and version numbers for equuleus-rc1+dev187
dzbaker Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/core_api/fsw/inc/cfe_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion modules/sb/fsw/src/cfe_sb_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Loading