Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp3452662pxb; Mon, 9 Nov 2020 11:28:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJxed5Qtkza9MYPb3a7eQ8rEGTegYdsBlsnyZ3xuRHyoNdTF0AkshXOCpkTxCgm7XJ6lFH6F X-Received: by 2002:a50:d582:: with SMTP id v2mr17383902edi.218.1604950117869; Mon, 09 Nov 2020 11:28:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604950117; cv=none; d=google.com; s=arc-20160816; b=LA2ZAYvy5VNB7zquRHUhCDnsMJmAn63r2i/yW0s7wkohmHafkU6hY3b1Ub1xELSyxt CfXY//zqOpFo8rWe5WpZZV7CD02E4J+ZtSkVtx2UbefLk8PX1I/gZqQvcebFZ7cQQd22 Nq5sClhx9ZI2IXEOOOOSmBmgfOzJHNcdGIuSQyNdWmPghATzaxDoFTUMT23tt7JiEvLo qQA9PeLLk1r1Yer/wtVcNirXe3agwNc1T/QzWGTNfrjYx8e+vz1b/OdU8YtjNjXuNrBl VRd8rWTJM9W7fThLSGRvsBb8zGvOS9fb1haUulaf7w0NwqX+8TBpM+HeIvMRBa1DmHjm 9R0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr; bh=IcPqlQ8vS88RvuX6VaNiReCbqcHtG7yxQJzsbyfcixI=; b=x4RKsicRjue1TOAyR0UJKK9TPhX7qPeJ1BbSP3hyUyywIuo0X93nWH3Jr+b97euon1 lVwTc01hG3b51QvACHkusEe0XWznbezdFcLq+DtAJM4aTCei5EUnrytiFB8OpaD/UGPj OBNWymxoyaNwZCRPMNl9wDgjWY3wCLRf+P84P9Vjg8SlPWjGTVaUAYTlMfGu3NrPbQmc xZdo9kmcvHRBmaG6XcmY4eW4Pi6IyN2rEsFP+Us88mGLu3juNgMY0siSRzPCBTw1fkWU +W+ZOEFrSvl/Y7ENgGT0S20gggKCL4YIMoSIGK8Kk43kj621MvKfeiXH7qXYfZ5Vc3DT 4hEg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cn3si9839568edb.17.2020.11.09.11.27.55; Mon, 09 Nov 2020 11:28:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729697AbgKIT1v (ORCPT + 99 others); Mon, 9 Nov 2020 14:27:51 -0500 Received: from mga04.intel.com ([192.55.52.120]:2020 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726691AbgKIT1u (ORCPT ); Mon, 9 Nov 2020 14:27:50 -0500 IronPort-SDR: O4ArIejYN8tvLpJXZYcdUSJCkO4wcI5tIZqJ60pRnuWg2ZXycHSsQxV7OUlJ6nNY72uPgjt8jL jq+o521nhepg== X-IronPort-AV: E=McAfee;i="6000,8403,9800"; a="167271647" X-IronPort-AV: E=Sophos;i="5.77,464,1596524400"; d="scan'208";a="167271647" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Nov 2020 11:27:50 -0800 IronPort-SDR: 4B0A76vp/SN/iSpFYoOA7ynbaAIaqNgZrWOeXaqfwTWQ9JVBBabpH40RzIPriYFR9r/aJUw/Wl oPKpakdhBhEQ== X-IronPort-AV: E=Sophos;i="5.77,464,1596524400"; d="scan'208";a="473110092" Received: from weidongc-mobl.amr.corp.intel.com (HELO ingas-nuc1.intel.com) ([10.212.33.54]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Nov 2020 11:27:50 -0800 From: Inga Stotland To: linux-bluetooth@vger.kernel.org Cc: luiz.von.dentz@intel.com, Inga Stotland Subject: [PATCH BlueZ] client: Remove reference to g_steal_pointer() Date: Mon, 9 Nov 2020 11:27:42 -0800 Message-Id: <20201109192742.42207-1-inga.stotland@intel.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org In order to avoid requiring higher version of GLib, replace g_steal_pointer() with explicitly setting the pointer value to NULL. --- client/adv_monitor.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/client/adv_monitor.c b/client/adv_monitor.c index 90ab0be09..8e81857af 100644 --- a/client/adv_monitor.c +++ b/client/adv_monitor.c @@ -254,10 +254,16 @@ void adv_monitor_add_manager(DBusConnection *conn, GDBusProxy *proxy) void adv_monitor_remove_manager(DBusConnection *conn) { - if (manager.supported_types != NULL) - g_slist_free(g_steal_pointer(&(manager.supported_types))); - if (manager.supported_features != NULL) - g_slist_free(g_steal_pointer(&(manager.supported_features))); + if (manager.supported_types != NULL) { + g_slist_free(manager.supported_types); + manager.supported_types = NULL; + } + + if (manager.supported_features != NULL) { + g_slist_free(manager.supported_features); + manager.supported_features = NULL; + } + manager.proxy = NULL; manager.app_registered = FALSE; } -- 2.26.2