patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

net: lwm2m: Add const qualifier to many pointers

Browse source 
Various functions, mostly concerning time-series cache, were not
using const pointer while they still did not modify the content.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
This commit is contained in:
Seppo Takalo 2023-02-21 15:11:48 +02:00 committed by Carles Cufí
parent dca5d62573
commit bf49540a8d
5 changed files with 31 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/zephyr/net/lwm2m.h
View file

@ -2157,7 +2157,7 @@ int lwm2m_engine_enable_cache(char const *resource_path, struct lwm2m_time_serie
* @return 0 for success or negative in case of error.
*
*/
int lwm2m_enable_cache(struct lwm2m_obj_path *path, struct lwm2m_time_series_elem *data_cache,
int lwm2m_enable_cache(const struct lwm2m_obj_path *path, struct lwm2m_time_series_elem *data_cache,
size_t cache_len);
#endif /* ZEPHYR_INCLUDE_NET_LWM2M_H_ */

31
subsys/net/lib/lwm2m/lwm2m_registry.c
View file

@ -60,8 +60,9 @@ sys_slist_t *lwm2m_engine_obj_list(void) { return &engine_obj_list; }
sys_slist_t *lwm2m_engine_obj_inst_list(void) { return &engine_obj_inst_list; }
#if defined(CONFIG_LWM2M_RESOURCE_DATA_CACHE_SUPPORT)
static void lwm2m_engine_cache_write(struct lwm2m_engine_obj_field *obj_field,
struct lwm2m_obj_path *path, const void *value, uint16_t len);
static void lwm2m_engine_cache_write(const struct lwm2m_engine_obj_field *obj_field,
const struct lwm2m_obj_path *path, const void *value,
uint16_t len);
#endif
/* Engine object */
@ -1556,7 +1557,8 @@ static int lwm2m_engine_allocate_resource_instance(struct lwm2m_engine_res *res,
return 0;
}
int lwm2m_engine_get_create_res_inst(struct lwm2m_obj_path *path, struct lwm2m_engine_res **res,
int lwm2m_engine_get_create_res_inst(const struct lwm2m_obj_path *path,
struct lwm2m_engine_res **res,
struct lwm2m_engine_res_inst **res_inst)
{
int ret;
@ -1953,7 +1955,8 @@ bool lwm2m_engine_shall_report_obj_version(const struct lwm2m_engine_obj *obj)
static sys_slist_t lwm2m_timed_cache_list;
static struct lwm2m_time_series_resource lwm2m_cache_entries[CONFIG_LWM2M_MAX_CACHED_RESOURCES];
static struct lwm2m_time_series_resource *lwm2m_cache_entry_allocate(struct lwm2m_obj_path *path)
static struct lwm2m_time_series_resource *
lwm2m_cache_entry_allocate(const struct lwm2m_obj_path *path)
{
int i;
struct lwm2m_time_series_resource *entry;
@ -1974,8 +1977,9 @@ static struct lwm2m_time_series_resource *lwm2m_cache_entry_allocate(struct lwm2
return NULL;
}
static void lwm2m_engine_cache_write(struct lwm2m_engine_obj_field *obj_field,
struct lwm2m_obj_path *path, const void *value, uint16_t len)
static void lwm2m_engine_cache_write(const struct lwm2m_engine_obj_field *obj_field,
const struct lwm2m_obj_path *path, const void *value,
uint16_t len)
{
struct lwm2m_time_series_resource *cache_entry;
struct lwm2m_time_series_elem elements;
@ -2047,7 +2051,8 @@ static void lwm2m_engine_cache_write(struct lwm2m_engine_obj_field *obj_field,
}
#endif /* CONFIG_LWM2M_RESOURCE_DATA_CACHE_SUPPORT */
struct lwm2m_time_series_resource *lwm2m_cache_entry_get_by_object(struct lwm2m_obj_path *obj_path)
struct lwm2m_time_series_resource *
lwm2m_cache_entry_get_by_object(const struct lwm2m_obj_path *obj_path)
{
#if defined(CONFIG_LWM2M_RESOURCE_DATA_CACHE_SUPPORT)
struct lwm2m_time_series_resource *entry;
@ -2071,7 +2076,7 @@ struct lwm2m_time_series_resource *lwm2m_cache_entry_get_by_object(struct lwm2m_
}
int lwm2m_enable_cache(struct lwm2m_obj_path *path, struct lwm2m_time_series_elem *data_cache,
int lwm2m_enable_cache(const struct lwm2m_obj_path *path, struct lwm2m_time_series_elem *data_cache,
size_t cache_len)
{
#if defined(CONFIG_LWM2M_RESOURCE_DATA_CACHE_SUPPORT)
@ -2126,7 +2131,7 @@ int lwm2m_enable_cache(struct lwm2m_obj_path *path, struct lwm2m_time_series_ele
#endif /* CONFIG_LWM2M_RESOURCE_DATA_CACHE_SUPPORT */
}
int lwm2m_engine_enable_cache(char const *resource_path, struct lwm2m_time_series_elem *data_cache,
int lwm2m_engine_enable_cache(const char *resource_path, struct lwm2m_time_series_elem *data_cache,
size_t cache_len)
{
#if defined(CONFIG_LWM2M_RESOURCE_DATA_CACHE_SUPPORT)
@ -2230,16 +2235,18 @@ bool lwm2m_cache_read(struct lwm2m_time_series_resource *cache_entry,
#endif
}
size_t lwm2m_cache_size(struct lwm2m_time_series_resource *cache_entry)
size_t lwm2m_cache_size(const struct lwm2m_time_series_resource *cache_entry)
{
#if defined(CONFIG_LWM2M_RESOURCE_DATA_CACHE_SUPPORT)
uint32_t bytes_available;
if (ring_buf_is_empty(&cache_entry->rb)) {
/* ring_buf_is_empty() takes non-const pointer but still does not modify */
if (ring_buf_is_empty((struct ring_buf *) &cache_entry->rb)) {
return 0;
}
bytes_available = ring_buf_size_get(&cache_entry->rb);
/* ring_buf_size_get() takes non-const pointer but still does not modify */
bytes_available = ring_buf_size_get((struct ring_buf *) &cache_entry->rb);
return (bytes_available / sizeof(struct lwm2m_time_series_elem));
#else

8
subsys/net/lib/lwm2m/lwm2m_registry.h
View file

@ -65,7 +65,8 @@ void lwm2m_unregister_obj(struct lwm2m_engine_obj *obj);
* @param[out] res_inst Engine resource instance buffer pointer.
* @return 0 for success or negative in case of error.
*/
int lwm2m_engine_get_create_res_inst(struct lwm2m_obj_path *path, struct lwm2m_engine_res **res,
int lwm2m_engine_get_create_res_inst(const struct lwm2m_obj_path *path,
struct lwm2m_engine_res **res,
struct lwm2m_engine_res_inst **res_inst);
/**
@ -242,11 +243,12 @@ struct lwm2m_cache_read_info {
#endif
int lwm2m_engine_data_cache_init(void);
struct lwm2m_time_series_resource *lwm2m_cache_entry_get_by_object(struct lwm2m_obj_path *obj_path);
struct lwm2m_time_series_resource *
lwm2m_cache_entry_get_by_object(const struct lwm2m_obj_path *obj_path);
bool lwm2m_cache_write(struct lwm2m_time_series_resource *cache_entry,
struct lwm2m_time_series_elem *buf);
bool lwm2m_cache_read(struct lwm2m_time_series_resource *cache_entry,
struct lwm2m_time_series_elem *buf);
size_t lwm2m_cache_size(struct lwm2m_time_series_resource *cache_entry);
size_t lwm2m_cache_size(const struct lwm2m_time_series_resource *cache_entry);
#endif /* LWM2M_REGISTRY_H */

5
subsys/net/lib/lwm2m/lwm2m_util.c
View file

@ -424,7 +424,8 @@ int lwm2m_ftoa(double *input, char *out, size_t outlen, int8_t dec_limit)
(val1 == 0 && val2 < 0) ? "-" : "", (long long)val1, buf);
}
int lwm2m_path_to_string(char *buf, size_t buf_size, struct lwm2m_obj_path *input, int level_max)
int lwm2m_path_to_string(char *buf, size_t buf_size, const struct lwm2m_obj_path *input,
int level_max)
{
size_t fpl = 0; /* Length of the formed path */
int level;
@ -552,7 +553,7 @@ int lwm2m_string_to_path(const char *pathstr, struct lwm2m_obj_path *path,
return 0;
}
bool lwm2m_obj_path_equal(struct lwm2m_obj_path *a, struct lwm2m_obj_path *b)
bool lwm2m_obj_path_equal(const struct lwm2m_obj_path *a, const struct lwm2m_obj_path *b)
{
uint8_t level = a->level;

5
subsys/net/lib/lwm2m/lwm2m_util.h
View file

@ -29,9 +29,10 @@ uint16_t lwm2m_atou16(const uint8_t *buf, uint16_t buflen, uint16_t *len);
*
* returns used buffer space with '\0'
*/
int lwm2m_path_to_string(char *buf, size_t buf_size, struct lwm2m_obj_path *input, int level_max);
int lwm2m_path_to_string(char *buf, size_t buf_size, const struct lwm2m_obj_path *input,
int level_max);
int lwm2m_string_to_path(const char *pathstr, struct lwm2m_obj_path *path, char delim);
bool lwm2m_obj_path_equal(struct lwm2m_obj_path *a, struct lwm2m_obj_path *b);
bool lwm2m_obj_path_equal(const struct lwm2m_obj_path *a, const struct lwm2m_obj_path *b);
#endif /* LWM2M_UTIL_H_ */