mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-25 06:56:14 +01:00
glib/giowin32.c (g_io_win32_dispatch): Check buffer condition here, too.
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:
parent
2c8e0c8d40
commit
1c653e3635
@ -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>
|
||||||
|
|
||||||
|
@ -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>
|
||||||
|
|
||||||
|
@ -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>
|
||||||
|
|
||||||
|
@ -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>
|
||||||
|
|
||||||
|
@ -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>
|
||||||
|
|
||||||
|
@ -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>
|
||||||
|
|
||||||
|
@ -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>
|
||||||
|
|
||||||
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user