OSDN Git Service

android: Avoid memory leak warnings for event_loop
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Thu, 28 Nov 2013 14:37:57 +0000 (16:37 +0200)
committerJohan 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

index fb16503..ac80c17 100644 (file)
@@ -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);