From 2d3fff85d7d2e7ad3c86fff625f0389ddaa24657 Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Sun, 11 Sep 2005 15:20:52 +0000 Subject: [PATCH] Remove some dead code. Closes bug #315278. 2005-09-11 Kjartan Maraas * glib/gmain.c: (g_child_watch_prepare), (g_child_watch_check), (child_watch_helper_thread): Remove some dead code. Closes bug #315278. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ glib/gmain.c | 20 -------------------- 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9dc471f..4c32449 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-09-11 Kjartan Maraas + + * glib/gmain.c: (g_child_watch_prepare), (g_child_watch_check), + (child_watch_helper_thread): Remove some dead code. Closes + bug #315278. + 2005-09-07 Tor Lillqvist * glib/Makefile.am: Create also a console version of the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9dc471f..4c32449 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-09-11 Kjartan Maraas + + * glib/gmain.c: (g_child_watch_prepare), (g_child_watch_check), + (child_watch_helper_thread): Remove some dead code. Closes + bug #315278. + 2005-09-07 Tor Lillqvist * glib/Makefile.am: Create also a console version of the diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 9dc471f..4c32449 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2005-09-11 Kjartan Maraas + + * glib/gmain.c: (g_child_watch_prepare), (g_child_watch_check), + (child_watch_helper_thread): Remove some dead code. Closes + bug #315278. + 2005-09-07 Tor Lillqvist * glib/Makefile.am: Create also a console version of the diff --git a/glib/gmain.c b/glib/gmain.c index 582d2f6..b5021b3 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -3492,11 +3492,8 @@ static gboolean g_child_watch_prepare (GSource *source, gint *timeout) { - GChildWatchSource *child_watch_source; *timeout = -1; - child_watch_source = (GChildWatchSource *) source; - return check_for_child_exited (source); } @@ -3504,10 +3501,6 @@ g_child_watch_prepare (GSource *source, static gboolean g_child_watch_check (GSource *source) { - GChildWatchSource *child_watch_source; - - child_watch_source = (GChildWatchSource *) source; - return check_for_child_exited (source); } @@ -3573,18 +3566,6 @@ g_child_watch_source_init_single (void) static gpointer child_watch_helper_thread (gpointer data) { - GPollFD fds; - GPollFunc poll_func; - -#ifdef HAVE_POLL - poll_func = (GPollFunc)poll; -#else - poll_func = g_poll; -#endif - - fds.fd = child_watch_wake_up_pipe[0]; - fds.events = G_IO_IN; - while (1) { gchar b[20]; @@ -3608,7 +3589,6 @@ child_watch_helper_thread (gpointer data) } G_UNLOCK (main_context_list); } - return NULL; } static void -- 2.7.4