luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-24 14:36:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

glib/giowin32.c (g_io_win32_dispatch): Check buffer condition here, too.

Browse Source 
2002-03-16  Tor Lillqvist  <tml@iki.fi>

	glib/giowin32.c (g_io_win32_dispatch): Check buffer condition
	here, too.
This commit is contained in:
Tor Lillqvist 2002-03-15 23:34:53 +00:00 committed by Tor Lillqvist
parent 2c8e0c8d40
commit 1c653e3635
8 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,11 +1,12 @@
2002-03-16 Tor Lillqvist <tml@iki.fi> 2002-03-16 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c: Some debugging output formatting changes. The * glib/giowin32.c: Some debugging output formatting changes. The
following two changes fixes a problem with buffered GIOChannels, following changes fix a problem with buffered GIOChannels, noticed
noticed with the help of Owen's test program, thanks! with the help of Owen's test program, thanks! (#59969)
(g_io_win32_prepare): Return value that takes the buffer condition (g_io_win32_prepare): Return value that takes the buffer condition
into account, like g_io_unix_prepare() does. into account, like g_io_unix_prepare() does.
(g_io_win32_check): Ditto, like g_io_unix_check(). (g_io_win32_check): Ditto, like g_io_unix_check().
(g_io_win32_dispatch): Ditto, like g_io_unix_dispatch().
Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com> Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com>

5
ChangeLog.pre-2-10
View File

@ -1,11 +1,12 @@
2002-03-16 Tor Lillqvist <tml@iki.fi> 2002-03-16 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c: Some debugging output formatting changes. The * glib/giowin32.c: Some debugging output formatting changes. The
following two changes fixes a problem with buffered GIOChannels, following changes fix a problem with buffered GIOChannels, noticed
noticed with the help of Owen's test program, thanks! with the help of Owen's test program, thanks! (#59969)
(g_io_win32_prepare): Return value that takes the buffer condition (g_io_win32_prepare): Return value that takes the buffer condition
into account, like g_io_unix_prepare() does. into account, like g_io_unix_prepare() does.
(g_io_win32_check): Ditto, like g_io_unix_check(). (g_io_win32_check): Ditto, like g_io_unix_check().
(g_io_win32_dispatch): Ditto, like g_io_unix_dispatch().
Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com> Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com>

5
ChangeLog.pre-2-12
View File

@ -1,11 +1,12 @@
2002-03-16 Tor Lillqvist <tml@iki.fi> 2002-03-16 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c: Some debugging output formatting changes. The * glib/giowin32.c: Some debugging output formatting changes. The
following two changes fixes a problem with buffered GIOChannels, following changes fix a problem with buffered GIOChannels, noticed
noticed with the help of Owen's test program, thanks! with the help of Owen's test program, thanks! (#59969)
(g_io_win32_prepare): Return value that takes the buffer condition (g_io_win32_prepare): Return value that takes the buffer condition
into account, like g_io_unix_prepare() does. into account, like g_io_unix_prepare() does.
(g_io_win32_check): Ditto, like g_io_unix_check(). (g_io_win32_check): Ditto, like g_io_unix_check().
(g_io_win32_dispatch): Ditto, like g_io_unix_dispatch().
Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com> Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com>

5
ChangeLog.pre-2-2
View File

@ -1,11 +1,12 @@
2002-03-16 Tor Lillqvist <tml@iki.fi> 2002-03-16 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c: Some debugging output formatting changes. The * glib/giowin32.c: Some debugging output formatting changes. The
following two changes fixes a problem with buffered GIOChannels, following changes fix a problem with buffered GIOChannels, noticed
noticed with the help of Owen's test program, thanks! with the help of Owen's test program, thanks! (#59969)
(g_io_win32_prepare): Return value that takes the buffer condition (g_io_win32_prepare): Return value that takes the buffer condition
into account, like g_io_unix_prepare() does. into account, like g_io_unix_prepare() does.
(g_io_win32_check): Ditto, like g_io_unix_check(). (g_io_win32_check): Ditto, like g_io_unix_check().
(g_io_win32_dispatch): Ditto, like g_io_unix_dispatch().
Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com> Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com>

5
ChangeLog.pre-2-4
View File

@ -1,11 +1,12 @@
2002-03-16 Tor Lillqvist <tml@iki.fi> 2002-03-16 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c: Some debugging output formatting changes. The * glib/giowin32.c: Some debugging output formatting changes. The
following two changes fixes a problem with buffered GIOChannels, following changes fix a problem with buffered GIOChannels, noticed
noticed with the help of Owen's test program, thanks! with the help of Owen's test program, thanks! (#59969)
(g_io_win32_prepare): Return value that takes the buffer condition (g_io_win32_prepare): Return value that takes the buffer condition
into account, like g_io_unix_prepare() does. into account, like g_io_unix_prepare() does.
(g_io_win32_check): Ditto, like g_io_unix_check(). (g_io_win32_check): Ditto, like g_io_unix_check().
(g_io_win32_dispatch): Ditto, like g_io_unix_dispatch().
Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com> Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com>

5
ChangeLog.pre-2-6
View File

@ -1,11 +1,12 @@
2002-03-16 Tor Lillqvist <tml@iki.fi> 2002-03-16 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c: Some debugging output formatting changes. The * glib/giowin32.c: Some debugging output formatting changes. The
following two changes fixes a problem with buffered GIOChannels, following changes fix a problem with buffered GIOChannels, noticed
noticed with the help of Owen's test program, thanks! with the help of Owen's test program, thanks! (#59969)
(g_io_win32_prepare): Return value that takes the buffer condition (g_io_win32_prepare): Return value that takes the buffer condition
into account, like g_io_unix_prepare() does. into account, like g_io_unix_prepare() does.
(g_io_win32_check): Ditto, like g_io_unix_check(). (g_io_win32_check): Ditto, like g_io_unix_check().
(g_io_win32_dispatch): Ditto, like g_io_unix_dispatch().
Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com> Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com>

5
ChangeLog.pre-2-8
View File

@ -1,11 +1,12 @@
2002-03-16 Tor Lillqvist <tml@iki.fi> 2002-03-16 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c: Some debugging output formatting changes. The * glib/giowin32.c: Some debugging output formatting changes. The
following two changes fixes a problem with buffered GIOChannels, following changes fix a problem with buffered GIOChannels, noticed
noticed with the help of Owen's test program, thanks! with the help of Owen's test program, thanks! (#59969)
(g_io_win32_prepare): Return value that takes the buffer condition (g_io_win32_prepare): Return value that takes the buffer condition
into account, like g_io_unix_prepare() does. into account, like g_io_unix_prepare() does.
(g_io_win32_check): Ditto, like g_io_unix_check(). (g_io_win32_check): Ditto, like g_io_unix_check().
(g_io_win32_dispatch): Ditto, like g_io_unix_dispatch().
Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com> Thu Mar 14 17:37:45 2002 Owen Taylor <otaylor@redhat.com>

3
glib/giowin32.c
View File

@ -619,6 +619,7 @@ g_io_win32_dispatch (GSource *source,
{ {
GIOFunc func = (GIOFunc)callback; GIOFunc func = (GIOFunc)callback;
GIOWin32Watch *watch = (GIOWin32Watch *)source; GIOWin32Watch *watch = (GIOWin32Watch *)source;
GIOCondition buffer_condition = g_io_channel_get_buffer_condition (watch->channel);
if (!func) if (!func)
{ {
@ -628,7 +629,7 @@ g_io_win32_dispatch (GSource *source,
} }
return (*func) (watch->channel, return (*func) (watch->channel,
watch->pollfd.revents & watch->condition, (watch->pollfd.revents | buffer_condition) & watch->condition,
user_data); user_data);
} }