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

osal Integration candidate: Equuleus-rc1+dev2 #1444

Merged
merged 3 commits into from
Jan 18, 2024
Merged

osal Integration candidate: Equuleus-rc1+dev2 #1444

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
12a2624
Fix pointer error in OS_GetErrorName
ahatstat Dec 14, 2023
128ab23
Merge pull request #1436 from ahatstat:fix-1435-OS_GetErrorName-Seg-F…
dzbaker Jan 18, 2024
ac71a6b
Updating documentation and version numbers for equuleus-rc1+dev37
dzbaker Jan 18, 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+dev37
- Fix pointer error in OS_GetErrorName
- See <https://github.com/nasa/osal/pull/1436>

## Development Build: equuleus-rc1+dev33
- updating OSAL to use new versioning system
- patch build for old RTEMS
Expand Down
2 changes: 1 addition & 1 deletion src/os/inc/osapi-version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
/*
* Development Build Macro Definitions
*/
#define OS_BUILD_NUMBER 33
#define OS_BUILD_NUMBER 37
#define OS_BUILD_BASELINE "equuleus-rc1"
#define OS_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
#define OS_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */
Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/src/osapi-errors.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ int32 OS_GetErrorName(int32 error_num, os_err_name_t *err_name)
if (Error->Number == error_num && Error->Name != NULL)
{
strncpy(*err_name, Error->Name, sizeof(*err_name) - 1);
*err_name[sizeof(*err_name) - 1] = 0;
(*err_name)[sizeof(*err_name) - 1] = 0;
return_code = OS_SUCCESS;
}
else
Expand Down
Loading