From 30556512d3b8f1cca607a1e72072a38ffc37b480 Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Tue, 29 Jul 2014 17:20:51 +0300 Subject: [PATCH] android/core: Use g_clear_error instead of free and assignment g_clear_error() frees err and set it to NULL. This fixes dead code warnings from analyzers. --- android/bluetooth.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/android/bluetooth.c b/android/bluetooth.c index a8d85ce59..cd1772ac5 100644 --- a/android/bluetooth.c +++ b/android/bluetooth.c @@ -290,8 +290,7 @@ static void load_adapter_config(void) "General", "DiscoverableTimeout", &gerr); if (gerr) { adapter.discoverable_timeout = DEFAULT_DISCOVERABLE_TIMEOUT; - g_error_free(gerr); - gerr = NULL; + g_clear_error(&gerr); } g_key_file_free(key_file); -- 2.47.3