From 3e9d7b3598e4f6c7a02658674d1c4864284e9921 Mon Sep 17 00:00:00 2001 From: Jarkko Paso Date: Fri, 16 Aug 2019 11:46:10 +0300 Subject: [PATCH 1/2] hal fhss timer: removed unnecessary and potentially unsafe memset --- .../nanostack-hal-mbed-cmsis-rtos/arm_hal_fhss_timer.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_fhss_timer.cpp b/features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_fhss_timer.cpp index c349432317..1bc080c2e5 100644 --- a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_fhss_timer.cpp +++ b/features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_fhss_timer.cpp @@ -77,7 +77,6 @@ static fhss_timeout_s *allocate_timeout(void) { for (int i = 0; i < NUMBER_OF_SIMULTANEOUS_TIMEOUTS; i++) { if (fhss_timeout[i].fhss_timer_callback == NULL) { - memset(&fhss_timeout[i], 0, sizeof(fhss_timeout_s)); return &fhss_timeout[i]; } } From 2aacb1c52721dab317584c188605886499c22530 Mon Sep 17 00:00:00 2001 From: Jarkko Paso Date: Mon, 19 Aug 2019 13:20:46 +0300 Subject: [PATCH 2/2] hal fhss timer: all static functions inside anonymous namespace --- .../nanostack-hal-mbed-cmsis-rtos/arm_hal_fhss_timer.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_fhss_timer.cpp b/features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_fhss_timer.cpp index 1bc080c2e5..3885747651 100644 --- a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_fhss_timer.cpp +++ b/features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_fhss_timer.cpp @@ -32,6 +32,7 @@ #define NUMBER_OF_SIMULTANEOUS_TIMEOUTS 2 #endif //NUMBER_OF_SIMULTANEOUS_TIMEOUTS +namespace { using namespace mbed; using namespace events; @@ -168,6 +169,7 @@ static uint32_t platform_fhss_timestamp_read(const fhss_api_t *api) (void)api; return read_current_time(); } +} // anonymous namespace fhss_timer_t fhss_functions = { .fhss_timer_start = platform_fhss_timer_start,