From 12a2624f1764e1a16bae05ea07809591944bf241 Mon Sep 17 00:00:00 2001 From: ahatstat Date: Thu, 14 Dec 2023 16:09:12 -0500 Subject: [PATCH 1/2] Fix pointer error in OS_GetErrorName --- src/os/shared/src/osapi-errors.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/os/shared/src/osapi-errors.c b/src/os/shared/src/osapi-errors.c index 253b7fa36..41573bd4c 100644 --- a/src/os/shared/src/osapi-errors.c +++ b/src/os/shared/src/osapi-errors.c @@ -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 From ac71a6b55950519f097281b96a5fd45d7076a95f Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 18 Jan 2024 14:59:07 -0500 Subject: [PATCH 2/2] Updating documentation and version numbers for equuleus-rc1+dev37 --- CHANGELOG.md | 4 ++++ src/os/inc/osapi-version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b50b7342..cead73fa7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Development Build: equuleus-rc1+dev37 +- Fix pointer error in OS_GetErrorName +- See + ## Development Build: equuleus-rc1+dev33 - updating OSAL to use new versioning system - patch build for old RTEMS diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h index f61b0ad3f..94f66958a 100644 --- 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 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 */