From 2e00c7a4b13bef7dd00fbef2450a54d53fb469db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Mon, 27 Jan 2020 19:24:36 +0100 Subject: [PATCH] enroll: Always use allocated memory for finger name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Given that finger_name is set by GOptionEntry, make sure it's always using allocated memory. ../utils/enroll.c:38:28: error: initialization discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 38 | static char *finger_name = "right-index-finger"; | ^~~~~~~~~~~~~~~~~~~~ --- utils/enroll.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/utils/enroll.c b/utils/enroll.c index 2149741..c8ab9eb 100644 --- a/utils/enroll.c +++ b/utils/enroll.c @@ -32,7 +32,7 @@ static DBusGProxy *manager = NULL; static DBusGConnection *connection = NULL; -static char *finger_name = "right-index-finger"; +static char *finger_name = NULL; static char **usernames = NULL; static void create_manager(void) @@ -175,11 +175,15 @@ int main(int argc, char **argv) return 1; } + if (finger_name == NULL) + finger_name = g_strdup("right-index-finger"); + create_manager(); dev = open_device(usernames ? usernames[0] : NULL); do_enroll(dev); release_device(dev); + g_free(finger_name); return 0; }