[PATCH BlueZ 1/2] tools: btmgmt: Add missing return after g_main_loop_quit()

[PATCH BlueZ 1/2] tools: btmgmt: Add missing return after g_main_loop_quit()

[Anderson Lizardo]

This change keeps semantic of previous code that used to call exit()
directly.
---
 tools/btmgmt.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/btmgmt.c b/tools/btmgmt.c
index 9753724..4650876 100644
--- a/tools/btmgmt.c
+++ b/tools/btmgmt.c
@@ -135,8 +135,10 @@ static void discovering(uint16_t index, uint16_t len, const void *param,
 		return;
 	}
 
-	if (ev->discovering == 0 && discovery)
+	if (ev->discovering == 0 && discovery) {
 		g_main_loop_quit(event_loop);
+		return;
+	}
 
 	if (monitor)
 		printf("hci%u type %u discovering %s\n", index,
-- 
1.7.9.5

[PATCH BlueZ 2/2] build: Remove leftover from .gitignore

[Anderson Lizardo]

profiles/sap/sap.c used to be a symlink to a SAP driver. This symlink is
not created anymore (only the dummy driver is linked to bluetoothd at
the moment.)
---
 .gitignore |    1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 9483b92..e306f68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,7 +32,6 @@ src/builtin.h
 src/bluetoothd
 tools/97-hid2hci.rules
 
-profiles/sap/sap.c
 profiles/cups/bluetooth
 profiles/iap/iapd
 
-- 
1.7.9.5

Re: [PATCH BlueZ 1/2] tools: btmgmt: Add missing return after g_main_loop_quit()

[Johan Hedberg]

Hi Lizardo,

On Tue, Feb 19, 2013, Anderson Lizardo wrote:
> This change keeps semantic of previous code that used to call exit()
> directly.
> ---
>  tools/btmgmt.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Both patches have been applied. Thanks.

Johan