Linux bluetooth development
 help / color / mirror / Atom feed
From: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 02/10] android/main: Remove timeout source on exit
Date: Thu, 28 Nov 2013 16:37:58 +0200	[thread overview]
Message-ID: <1385649486-19978-2-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1385649486-19978-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>

From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>

This fixes memory leak types of warnings from some tools.
---
 android/main.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/android/main.c b/android/main.c
index 830eef2..dd5c622 100644
--- a/android/main.c
+++ b/android/main.c
@@ -575,8 +575,10 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	}
 
-	if (!bt_bluetooth_start(option_index, adapter_ready))
+	if (!bt_bluetooth_start(option_index, adapter_ready)) {
+		g_source_remove(bluetooth_start_timeout);
 		return EXIT_FAILURE;
+	}
 
 	/* Use params: mtu = 0, flags = 0 */
 	start_sdp_server(0, 0);
@@ -589,6 +591,9 @@ int main(int argc, char *argv[])
 
 	g_source_remove(signal);
 
+	if (bluetooth_start_timeout > 0)
+		g_source_remove(bluetooth_start_timeout);
+
 	cleanup_hal_connection();
 	stop_sdp_server();
 	bt_bluetooth_cleanup();
-- 
1.8.3.2


  reply	other threads:[~2013-11-28 14:37 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-28 14:37 [PATCH 01/10] android: Avoid memory leak warnings for event_loop Andrei Emeltchenko
2013-11-28 14:37 ` Andrei Emeltchenko [this message]
2013-11-28 14:37 ` [PATCH 03/10] android/main: Remove signal source on exit Andrei Emeltchenko
2013-11-28 14:38 ` [PATCH 04/10] android/main: Free enabled string " Andrei Emeltchenko
2013-11-29  8:29   ` Johan Hedberg
2013-11-28 14:38 ` [PATCH 05/10] android/socket: Cleanup sockets on unregister Andrei Emeltchenko
2013-11-29  8:26   ` Johan Hedberg
2013-11-28 14:38 ` [PATCH 06/10] android/socket: Fix rfsock lists Andrei Emeltchenko
2013-11-28 14:38 ` [PATCH 07/10] android/hidhost: Shutdown ctrl_io channel if intr_io fails Andrei Emeltchenko
2013-11-28 14:38 ` [PATCH 08/10] android/socket: Strip extra log messages Andrei Emeltchenko
2013-11-28 14:38 ` [PATCH 09/10] android/socket: Avoid double close of file descriptor Andrei Emeltchenko
2013-11-28 14:38 ` [PATCH 10/10] android/socket: Remove unneeded code Andrei Emeltchenko
2013-11-29  8:31   ` Johan Hedberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1385649486-19978-2-git-send-email-Andrei.Emeltchenko.news@gmail.com \
    --to=andrei.emeltchenko.news@gmail.com \
    --cc=linux-bluetooth@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox