From 0e5250c475ee08a7f2d71bf75109921c297f1eb5 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Fri, 3 May 2024 12:24:02 +0200 Subject: [PATCH] const: _reserved --- lib/report/report.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/report/report.c b/lib/report/report.c index 126159767..e8572fd4e 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -1183,11 +1183,11 @@ static int _lv_time_handler(struct dm_report *rh, struct dm_pool *mem, #define DYNAMIC DM_REPORT_FIELD_RESERVED_VALUE_DYNAMIC_VALUE #define TYPE_RESERVED_VALUE(type, flags, id, desc, value, ...) \ - static const char *_reserved_ ## id ## _names[] = { __VA_ARGS__, NULL}; \ + static const char * const _reserved_ ## id ## _names[] = { __VA_ARGS__, NULL}; \ static const type _reserved_ ## id = value; #define FIELD_RESERVED_VALUE(flags, field_id, id, desc, value, ...) \ - static const char *_reserved_ ## id ## _names[] = { __VA_ARGS__ , NULL}; \ + static const char * const _reserved_ ## id ## _names[] = { __VA_ARGS__ , NULL}; \ static const struct dm_report_field_reserved_value _reserved_ ## id = {field_ ## field_id, value}; #define FIELD_RESERVED_BINARY_VALUE(field_id, id, desc, ...) \ @@ -1224,9 +1224,10 @@ static int _lv_time_handler(struct dm_report *rh, struct dm_pool *mem, #define FUZZY DM_REPORT_FIELD_RESERVED_VALUE_FUZZY_NAMES #define DYNAMIC DM_REPORT_FIELD_RESERVED_VALUE_DYNAMIC_VALUE -#define TYPE_RESERVED_VALUE(type, flags, id, desc, value, ...) {type | flags, &_reserved_ ## id, _reserved_ ## id ## _names, desc}, +/* Declaration of dm_report_reserved_value should actually be using const char * const * names */ +#define TYPE_RESERVED_VALUE(type, flags, id, desc, value, ...) {type | flags, &_reserved_ ## id, (const char**) _reserved_ ## id ## _names, desc}, -#define FIELD_RESERVED_VALUE(flags, field_id, id, desc, value, ...) {DM_REPORT_FIELD_TYPE_NONE | flags, &_reserved_ ## id, _reserved_ ## id ## _names, desc}, +#define FIELD_RESERVED_VALUE(flags, field_id, id, desc, value, ...) {DM_REPORT_FIELD_TYPE_NONE | flags, &_reserved_ ## id, (const char**) _reserved_ ## id ## _names, desc}, #define FIELD_RESERVED_BINARY_VALUE(field_id, id, desc, ...) \ FIELD_RESERVED_VALUE(NAMED, field_id, id ## _y, desc, &_one64, __VA_ARGS__) \ -- 2.43.5