From 85755f7e77f5283cc13d2e8f7d841d2e151bfc33 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Mon, 21 Dec 1998 03:28:25 +0000 Subject: [PATCH] default initialize source_timeout with -1 so we have a sane timeout value Mon Dec 21 03:48:04 1998 Tim Janik * gmain.c (g_main_iterate): default initialize source_timeout with -1 so we have a sane timeout value if (*prpare) doesn't set it. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gmain.c | 4 ++-- gmain.c | 4 ++-- 10 files changed, 44 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84b2630..db644f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Dec 21 03:48:04 1998 Tim Janik + + * gmain.c (g_main_iterate): default initialize source_timeout with -1 + so we have a sane timeout value if (*prpare) doesn't set it. + Sat Dec 19 16:56:02 1998 Owen Taylor * glib.h gmain.c (G_PRIORITY_LOW): Add #defines defining diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 84b2630..db644f3 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Mon Dec 21 03:48:04 1998 Tim Janik + + * gmain.c (g_main_iterate): default initialize source_timeout with -1 + so we have a sane timeout value if (*prpare) doesn't set it. + Sat Dec 19 16:56:02 1998 Owen Taylor * glib.h gmain.c (G_PRIORITY_LOW): Add #defines defining diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 84b2630..db644f3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon Dec 21 03:48:04 1998 Tim Janik + + * gmain.c (g_main_iterate): default initialize source_timeout with -1 + so we have a sane timeout value if (*prpare) doesn't set it. + Sat Dec 19 16:56:02 1998 Owen Taylor * glib.h gmain.c (G_PRIORITY_LOW): Add #defines defining diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 84b2630..db644f3 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Mon Dec 21 03:48:04 1998 Tim Janik + + * gmain.c (g_main_iterate): default initialize source_timeout with -1 + so we have a sane timeout value if (*prpare) doesn't set it. + Sat Dec 19 16:56:02 1998 Owen Taylor * glib.h gmain.c (G_PRIORITY_LOW): Add #defines defining diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 84b2630..db644f3 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Mon Dec 21 03:48:04 1998 Tim Janik + + * gmain.c (g_main_iterate): default initialize source_timeout with -1 + so we have a sane timeout value if (*prpare) doesn't set it. + Sat Dec 19 16:56:02 1998 Owen Taylor * glib.h gmain.c (G_PRIORITY_LOW): Add #defines defining diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 84b2630..db644f3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Mon Dec 21 03:48:04 1998 Tim Janik + + * gmain.c (g_main_iterate): default initialize source_timeout with -1 + so we have a sane timeout value if (*prpare) doesn't set it. + Sat Dec 19 16:56:02 1998 Owen Taylor * glib.h gmain.c (G_PRIORITY_LOW): Add #defines defining diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 84b2630..db644f3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon Dec 21 03:48:04 1998 Tim Janik + + * gmain.c (g_main_iterate): default initialize source_timeout with -1 + so we have a sane timeout value if (*prpare) doesn't set it. + Sat Dec 19 16:56:02 1998 Owen Taylor * glib.h gmain.c (G_PRIORITY_LOW): Add #defines defining diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 84b2630..db644f3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon Dec 21 03:48:04 1998 Tim Janik + + * gmain.c (g_main_iterate): default initialize source_timeout with -1 + so we have a sane timeout value if (*prpare) doesn't set it. + Sat Dec 19 16:56:02 1998 Owen Taylor * glib.h gmain.c (G_PRIORITY_LOW): Add #defines defining diff --git a/glib/gmain.c b/glib/gmain.c index c3586ac..360821d 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -436,7 +436,7 @@ g_main_iterate (gboolean block, gboolean dispatch) { GHook *hook; - GTimeVal current_time; + GTimeVal current_time ={ 0, 0 }; gint n_ready = 0; gint current_priority = 0; gint timeout; @@ -468,7 +468,7 @@ g_main_iterate (gboolean block, { GSource *source = (GSource *)hook; GHook *tmp; - gint source_timeout; + gint source_timeout = -1; if ((n_ready > 0) && (source->priority > current_priority)) break; diff --git a/gmain.c b/gmain.c index c3586ac..360821d 100644 --- a/gmain.c +++ b/gmain.c @@ -436,7 +436,7 @@ g_main_iterate (gboolean block, gboolean dispatch) { GHook *hook; - GTimeVal current_time; + GTimeVal current_time ={ 0, 0 }; gint n_ready = 0; gint current_priority = 0; gint timeout; @@ -468,7 +468,7 @@ g_main_iterate (gboolean block, { GSource *source = (GSource *)hook; GHook *tmp; - gint source_timeout; + gint source_timeout = -1; if ((n_ready > 0) && (source->priority > current_priority)) break; -- 2.7.4