From 1fa7e1260d8b3c588c65ecb0c0f5d589ab61b1be Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Fri, 31 Jan 2020 10:13:35 +0100 Subject: cli: fix warnings with -Wshadow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit mmcli-manager.c: In function ‘context_free’: mmcli-manager.c:167:24: error: declaration of ‘ctx’ shadows a global declaration [-Werror=shadow] 167 | context_free (Context *ctx) | ~~~~~~~~~^~~ mmcli-manager.c:51:17: note: shadowed declaration is here 51 | static Context *ctx; | ^~~ ... --- cli/mmcli-modem-firmware.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'cli/mmcli-modem-firmware.c') diff --git a/cli/mmcli-modem-firmware.c b/cli/mmcli-modem-firmware.c index 48d08628..20dce4fe 100644 --- a/cli/mmcli-modem-firmware.c +++ b/cli/mmcli-modem-firmware.c @@ -106,7 +106,7 @@ mmcli_modem_firmware_options_enabled (void) } static void -context_free (Context *ctx) +context_free (void) { if (!ctx) return; @@ -136,7 +136,7 @@ ensure_modem_firmware (void) void mmcli_modem_firmware_shutdown (void) { - context_free (ctx); + context_free (); } static void @@ -344,7 +344,6 @@ mmcli_modem_firmware_run_synchronous (GDBusConnection *connection) /* Request to select a given image? */ if (select_str) { gboolean result; - GError *error = NULL; g_debug ("Synchronously selecting firmware image in modem..."); result = mm_modem_firmware_select_sync (ctx->modem_firmware, -- cgit v1.2.3-70-g09d2