luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-03 12:19:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make interval unsigned to match g_timeout_source_new(). (#82624, Tim

Browse Source 
Thu Jun 13 16:12:04 2002  Owen Taylor  <otaylor@redhat.com>

        * glib/gmain.c (struct _GTimeoutSource): Make
        interval unsigned to match g_timeout_source_new().
        (#82624, Tim Janik.)

        * glib/gmain.c (g_timeout_prepare): Add some
        extra gymnastics to avoid signed/unisgned integer
        overflows.
This commit is contained in:
Owen Taylor
2002-06-13 20:14:52 +00:00
committed by Owen Taylor
parent 3eebce18fc
commit 7fe389e70d
8 changed files with 73 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -1,3 +1,13 @@
Thu Jun 13 16:12:04 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (struct _GTimeoutSource): Make
interval unsigned to match g_timeout_source_new().
(#82624, Tim Janik.)
* glib/gmain.c (g_timeout_prepare): Add some
extra gymnastics to avoid signed/unisgned integer
overflows.
Thu Jun 13 15:57:46 2002 Owen Taylor <otaylor@redhat.com> Thu Jun 13 15:57:46 2002 Owen Taylor <otaylor@redhat.com>
* INSTALL.in: Add a note about the deficiency * INSTALL.in: Add a note about the deficiency

10
ChangeLog.pre-2-10
View File

@@ -1,3 +1,13 @@
Thu Jun 13 16:12:04 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (struct _GTimeoutSource): Make
interval unsigned to match g_timeout_source_new().
(#82624, Tim Janik.)
* glib/gmain.c (g_timeout_prepare): Add some
extra gymnastics to avoid signed/unisgned integer
overflows.
Thu Jun 13 15:57:46 2002 Owen Taylor <otaylor@redhat.com> Thu Jun 13 15:57:46 2002 Owen Taylor <otaylor@redhat.com>
* INSTALL.in: Add a note about the deficiency * INSTALL.in: Add a note about the deficiency

10
ChangeLog.pre-2-12
View File

@@ -1,3 +1,13 @@
Thu Jun 13 16:12:04 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (struct _GTimeoutSource): Make
interval unsigned to match g_timeout_source_new().
(#82624, Tim Janik.)
* glib/gmain.c (g_timeout_prepare): Add some
extra gymnastics to avoid signed/unisgned integer
overflows.
Thu Jun 13 15:57:46 2002 Owen Taylor <otaylor@redhat.com> Thu Jun 13 15:57:46 2002 Owen Taylor <otaylor@redhat.com>
* INSTALL.in: Add a note about the deficiency * INSTALL.in: Add a note about the deficiency

10
ChangeLog.pre-2-2
View File

@@ -1,3 +1,13 @@
Thu Jun 13 16:12:04 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (struct _GTimeoutSource): Make
interval unsigned to match g_timeout_source_new().
(#82624, Tim Janik.)
* glib/gmain.c (g_timeout_prepare): Add some
extra gymnastics to avoid signed/unisgned integer
overflows.
Thu Jun 13 15:57:46 2002 Owen Taylor <otaylor@redhat.com> Thu Jun 13 15:57:46 2002 Owen Taylor <otaylor@redhat.com>
* INSTALL.in: Add a note about the deficiency * INSTALL.in: Add a note about the deficiency

10
ChangeLog.pre-2-4
View File

@@ -1,3 +1,13 @@
Thu Jun 13 16:12:04 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (struct _GTimeoutSource): Make
interval unsigned to match g_timeout_source_new().
(#82624, Tim Janik.)
* glib/gmain.c (g_timeout_prepare): Add some
extra gymnastics to avoid signed/unisgned integer
overflows.
Thu Jun 13 15:57:46 2002 Owen Taylor <otaylor@redhat.com> Thu Jun 13 15:57:46 2002 Owen Taylor <otaylor@redhat.com>
* INSTALL.in: Add a note about the deficiency * INSTALL.in: Add a note about the deficiency

10
ChangeLog.pre-2-6
View File

@@ -1,3 +1,13 @@
Thu Jun 13 16:12:04 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (struct _GTimeoutSource): Make
interval unsigned to match g_timeout_source_new().
(#82624, Tim Janik.)
* glib/gmain.c (g_timeout_prepare): Add some
extra gymnastics to avoid signed/unisgned integer
overflows.
Thu Jun 13 15:57:46 2002 Owen Taylor <otaylor@redhat.com> Thu Jun 13 15:57:46 2002 Owen Taylor <otaylor@redhat.com>
* INSTALL.in: Add a note about the deficiency * INSTALL.in: Add a note about the deficiency

10
ChangeLog.pre-2-8
View File

@@ -1,3 +1,13 @@
Thu Jun 13 16:12:04 2002 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (struct _GTimeoutSource): Make
interval unsigned to match g_timeout_source_new().
(#82624, Tim Janik.)
* glib/gmain.c (g_timeout_prepare): Add some
extra gymnastics to avoid signed/unisgned integer
overflows.
Thu Jun 13 15:57:46 2002 Owen Taylor <otaylor@redhat.com> Thu Jun 13 15:57:46 2002 Owen Taylor <otaylor@redhat.com>
* INSTALL.in: Add a note about the deficiency * INSTALL.in: Add a note about the deficiency

6
glib/gmain.c
View File

@@ -153,7 +153,7 @@ struct _GTimeoutSource
{ {
GSource source; GSource source;
GTimeVal expiration; GTimeVal expiration;
gint interval; guint interval;
}; };
struct _GPollRec struct _GPollRec
@@ -2937,11 +2937,11 @@ g_timeout_prepare (GSource *source,
* this at least avoids hanging for long periods of time. * this at least avoids hanging for long periods of time.
*/ */
g_timeout_set_expiration (timeout_source, &current_time); g_timeout_set_expiration (timeout_source, &current_time);
msec = timeout_source->interval; msec = MIN (G_MAXINT, timeout_source->interval);
} }
else else
{ {
msec += sec * 1000; msec = MIN (G_MAXINT, (guint)msec + 1000 * (guint)sec);
} }
} }