OSDN Git Service
(root)
/
android-x86
/
external-bluetooth-bluez.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7624ea2
)
android: Avoid memory leak warnings for event_loop
author
Andrei Emeltchenko
<andrei.emeltchenko@intel.com>
Thu, 28 Nov 2013 14:37:57 +0000
(16:37 +0200)
committer
Johan Hedberg
<johan.hedberg@intel.com>
Fri, 29 Nov 2013 08:28:49 +0000
(10:28 +0200)
Move creation of event_loop closer to g_main_loop_run. This avoids
calling g_main_loop_unref too many times in initialization error paths.
This is safe since g_main_loop_quit eval to NOOP if parameter == NULL.
android/main.c
patch
|
blob
|
history
diff --git
a/android/main.c
b/android/main.c
index
fb16503
..
ac80c17
100644
(file)
--- a/
android/main.c
+++ b/
android/main.c
@@
-556,7
+556,6
@@
int main(int argc, char *argv[])
exit(EXIT_SUCCESS);
}
- event_loop = g_main_loop_new(NULL, FALSE);
signal = setup_signalfd();
if (!signal)
return EXIT_FAILURE;
@@
-581,6
+580,8
@@
int main(int argc, char *argv[])
DBG("Entering main loop");
+ event_loop = g_main_loop_new(NULL, FALSE);
+
g_main_loop_run(event_loop);
g_source_remove(signal);