From 27f20495a7f74b65b87e4d6fe677ef2f23660d9f Mon Sep 17 00:00:00 2001 From: Ingo Franzki Date: Mon, 8 Jun 2026 09:18:39 +0200 Subject: [PATCH] zkey: Fix 'assignment discards 'const' qualifier' warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix compile warnings like warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] by declaring the variables as const or cast appropriately. Reviewed-by: Finn Callies Signed-off-by: Ingo Franzki Signed-off-by: Jan Höppner --- zkey/keystore.c | 2 +- zkey/properties.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/zkey/keystore.c b/zkey/keystore.c index ea1c8463..4945130a 100644 --- a/zkey/keystore.c +++ b/zkey/keystore.c @@ -1423,7 +1423,7 @@ static int _keystore_volume_check(const char *volume, bool remove, bool set, } info->volume = util_strdup(volume); - ch = strchr(info->volume, ':'); + ch = (char *)strchr(info->volume, ':'); if (ch == NULL || strlen(ch + 1) == 0) { warnx("Volume specification must contain a dm-crypt mapping " "name separated by a colon"); diff --git a/zkey/properties.c b/zkey/properties.c index 42183ee9..09d8c014 100644 --- a/zkey/properties.c +++ b/zkey/properties.c @@ -540,11 +540,11 @@ unsigned int str_list_count(const char *str_list) * or NULL if the string was not found * */ -static char *str_list_find(const char *str_list, const char *str) +static const char *str_list_find(const char *str_list, const char *str) { - char *before; - char *after; - char *ch; + const char *before; + const char *after; + const char *ch; ch = strstr(str_list, str); if (ch == NULL) @@ -608,9 +608,9 @@ char *str_list_add(const char *str_list, const char *str) */ char *str_list_remove(const char *str_list, const char *str) { - char *after; + const char *after; + const char *ch; char *ret; - char *ch; util_assert(str_list != NULL, "Internal error: str_list is NULL"); util_assert(str != NULL, "Internal error: str is NULL");