luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-24 21:16:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug 500246 - Bug fixes for giowin32

Browse Source 
2008-08-20  Tor Lillqvist  <tml@novell.com>

	Bug 500246 - Bug fixes for giowin32

	* glib/giowin32.c (read_thread) (write_thread): Change the nbytes
	variables to signed.
	(g_io_channel_win32_make_pollfd): Fix an obvious error in the file
	descriptor case leftover after the patch from bug #333098 on
	2006-03-02. Thanks to Marcus Brinkmann.


svn path=/trunk/; revision=7373
This commit is contained in:
Tor Lillqvist 2008-08-20 01:30:31 +00:00 committed by Tor Lillqvist
parent f7f48d5c08
commit 971ab2b50f
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2008-08-20 Tor Lillqvist <tml@novell.com>
Bug 500246 - Bug fixes for giowin32
* glib/giowin32.c (read_thread) (write_thread): Change the nbytes
variables to signed.
(g_io_channel_win32_make_pollfd): Fix an obvious error in the file
descriptor case leftover after the patch from bug #333098 on
2006-03-02. Thanks to Marcus Brinkmann.
2008-08-20 Tor Lillqvist <tml@novell.com>
Bug 324234 - Using g_io_add_watch_full() to wait for connect() to

12
glib/giowin32.c
View File

@ -311,7 +311,7 @@ read_thread (void *parameter)
{
GIOWin32Channel *channel = parameter;
guchar *buffer;
guint nbytes;
gint nbytes;
g_io_channel_ref ((GIOChannel *)channel);
@ -422,7 +422,7 @@ write_thread (void *parameter)
{
GIOWin32Channel *channel = parameter;
guchar *buffer;
guint nbytes;
gint nbytes;
g_io_channel_ref ((GIOChannel *)channel);
@ -2095,8 +2095,14 @@ g_io_channel_win32_make_pollfd (GIOChannel *channel,
fd->fd = (gintptr) win32_channel->data_avail_event;
if (win32_channel->thread_id == 0 && (condition & G_IO_IN))
if (win32_channel->thread_id == 0)
{
/* Is it meaningful for a file descriptor to be polled for
* both IN and OUT? For what kind of file descriptor would
* that be? Doesn't seem to make sense, in practise the file
* descriptors handled here are always read or write ends of
* pipes surely, and thus unidirectional.
*/
if (condition & G_IO_IN)
create_thread (win32_channel, condition, read_thread);
else if (condition & G_IO_OUT)