From b50cd5b12db40927ec893cd5cd36f39f5a669e3b Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Tue, 26 Jan 2021 16:19:47 -0500 Subject: [PATCH] Fix #723, CFE_EVS_Register const correct and report truncation --- fsw/cfe-core/src/evs/cfe_evs.c | 4 +++- fsw/cfe-core/src/inc/cfe_evs.h | 2 +- fsw/cfe-core/ut-stubs/ut_evs_stubs.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fsw/cfe-core/src/evs/cfe_evs.c b/fsw/cfe-core/src/evs/cfe_evs.c index 1d5f8a19a..e6d0c54f3 100644 --- a/fsw/cfe-core/src/evs/cfe_evs.c +++ b/fsw/cfe-core/src/evs/cfe_evs.c @@ -50,7 +50,7 @@ /* ** Function: CFE_EVS_Register - See API and header file for details */ -int32 CFE_EVS_Register (void *Filters, uint16 NumEventFilters, uint16 FilterScheme) +int32 CFE_EVS_Register (const void *Filters, uint16 NumEventFilters, uint16 FilterScheme) { uint16 FilterLimit; uint16 i; @@ -89,6 +89,8 @@ int32 CFE_EVS_Register (void *Filters, uint16 NumEventFilters, uint16 FilterSche else { FilterLimit = CFE_PLATFORM_EVS_MAX_EVENT_FILTERS; + CFE_ES_WriteToSysLog("CFE_EVS_Register: Filter limit truncated to %d\n", + (int)FilterLimit); } if (Filters != NULL) diff --git a/fsw/cfe-core/src/inc/cfe_evs.h b/fsw/cfe-core/src/inc/cfe_evs.h index 9b0a62517..c2ae7fa8e 100644 --- a/fsw/cfe-core/src/inc/cfe_evs.h +++ b/fsw/cfe-core/src/inc/cfe_evs.h @@ -149,7 +149,7 @@ typedef struct CFE_EVS_BinFilter { ** \sa #CFE_EVS_Unregister ** **/ -CFE_Status_t CFE_EVS_Register (void *Filters, /* Pointer to an array of filters */ +CFE_Status_t CFE_EVS_Register (const void *Filters, /* Pointer to an array of filters */ uint16 NumFilteredEvents, /* How many elements in the array? */ uint16 FilterScheme); /* Filtering Algorithm to be implemented */ diff --git a/fsw/cfe-core/ut-stubs/ut_evs_stubs.c b/fsw/cfe-core/ut-stubs/ut_evs_stubs.c index 5aa12224e..4b5ba0a03 100644 --- a/fsw/cfe-core/ut-stubs/ut_evs_stubs.c +++ b/fsw/cfe-core/ut-stubs/ut_evs_stubs.c @@ -201,7 +201,7 @@ int32 CFE_EVS_SendTimedEvent(CFE_TIME_SysTime_t Time, ** Returns either a user-defined status flag or CFE_SUCCESS. ** ******************************************************************************/ -int32 CFE_EVS_Register(void *Filters, +int32 CFE_EVS_Register(const void *Filters, uint16 NumFilteredEvents, uint16 FilterScheme) {