mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-02 17:26:17 +01:00
glib/giowin32.c (g_io_channel_win32_init, g_io_win32_free) Initialize
2004-07-01 John Ehresman <jpe@wingide.com> * glib/giowin32.c (g_io_channel_win32_init, g_io_win32_free) Initialize reset_send & reset_recv fields and don't close sockets unless they were created. (#145153)
This commit is contained in:
parent
ef9a178b8e
commit
14892c1dc8
@ -1,3 +1,9 @@
|
|||||||
|
2004-07-01 John Ehresman <jpe@wingide.com>
|
||||||
|
|
||||||
|
* glib/giowin32.c (g_io_channel_win32_init, g_io_win32_free)
|
||||||
|
Initialize reset_send & reset_recv fields and don't close
|
||||||
|
sockets unless they were created. (#145153)
|
||||||
|
|
||||||
Fri Jun 11 22:56:46 2004 Matthias Clasen <maclas@gmx.de>
|
Fri Jun 11 22:56:46 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
* glib/gscanner.c (g_scanner_get_token_ll): Ignore a
|
* glib/gscanner.c (g_scanner_get_token_ll): Ignore a
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
2004-07-01 John Ehresman <jpe@wingide.com>
|
||||||
|
|
||||||
|
* glib/giowin32.c (g_io_channel_win32_init, g_io_win32_free)
|
||||||
|
Initialize reset_send & reset_recv fields and don't close
|
||||||
|
sockets unless they were created. (#145153)
|
||||||
|
|
||||||
Fri Jun 11 22:56:46 2004 Matthias Clasen <maclas@gmx.de>
|
Fri Jun 11 22:56:46 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
* glib/gscanner.c (g_scanner_get_token_ll): Ignore a
|
* glib/gscanner.c (g_scanner_get_token_ll): Ignore a
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
2004-07-01 John Ehresman <jpe@wingide.com>
|
||||||
|
|
||||||
|
* glib/giowin32.c (g_io_channel_win32_init, g_io_win32_free)
|
||||||
|
Initialize reset_send & reset_recv fields and don't close
|
||||||
|
sockets unless they were created. (#145153)
|
||||||
|
|
||||||
Fri Jun 11 22:56:46 2004 Matthias Clasen <maclas@gmx.de>
|
Fri Jun 11 22:56:46 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
* glib/gscanner.c (g_scanner_get_token_ll): Ignore a
|
* glib/gscanner.c (g_scanner_get_token_ll): Ignore a
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
2004-07-01 John Ehresman <jpe@wingide.com>
|
||||||
|
|
||||||
|
* glib/giowin32.c (g_io_channel_win32_init, g_io_win32_free)
|
||||||
|
Initialize reset_send & reset_recv fields and don't close
|
||||||
|
sockets unless they were created. (#145153)
|
||||||
|
|
||||||
Fri Jun 11 22:56:46 2004 Matthias Clasen <maclas@gmx.de>
|
Fri Jun 11 22:56:46 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
* glib/gscanner.c (g_scanner_get_token_ll): Ignore a
|
* glib/gscanner.c (g_scanner_get_token_ll): Ignore a
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
2004-07-01 John Ehresman <jpe@wingide.com>
|
||||||
|
|
||||||
|
* glib/giowin32.c (g_io_channel_win32_init, g_io_win32_free)
|
||||||
|
Initialize reset_send & reset_recv fields and don't close
|
||||||
|
sockets unless they were created. (#145153)
|
||||||
|
|
||||||
Fri Jun 11 22:56:46 2004 Matthias Clasen <maclas@gmx.de>
|
Fri Jun 11 22:56:46 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
* glib/gscanner.c (g_scanner_get_token_ll): Ignore a
|
* glib/gscanner.c (g_scanner_get_token_ll): Ignore a
|
||||||
|
@ -183,6 +183,8 @@ g_io_channel_win32_init (GIOWin32Channel *channel)
|
|||||||
channel->data_avail_event = NULL;
|
channel->data_avail_event = NULL;
|
||||||
channel->revents = 0;
|
channel->revents = 0;
|
||||||
channel->space_avail_event = NULL;
|
channel->space_avail_event = NULL;
|
||||||
|
channel->reset_send = INVALID_SOCKET;
|
||||||
|
channel->reset_recv = INVALID_SOCKET;
|
||||||
channel->data_avail_noticed_event = NULL;
|
channel->data_avail_noticed_event = NULL;
|
||||||
channel->watches = NULL;
|
channel->watches = NULL;
|
||||||
InitializeCriticalSection (&channel->mutex);
|
InitializeCriticalSection (&channel->mutex);
|
||||||
@ -861,9 +863,9 @@ g_io_win32_free (GIOChannel *channel)
|
|||||||
win32_channel->thread_id,
|
win32_channel->thread_id,
|
||||||
win32_channel->fd);
|
win32_channel->fd);
|
||||||
|
|
||||||
if (win32_channel->reset_send)
|
if (win32_channel->reset_send && win32_channel->reset_send != INVALID_SOCKET)
|
||||||
closesocket (win32_channel->reset_send);
|
closesocket (win32_channel->reset_send);
|
||||||
if (win32_channel->reset_recv)
|
if (win32_channel->reset_recv && win32_channel->reset_recv != INVALID_SOCKET)
|
||||||
closesocket (win32_channel->reset_recv);
|
closesocket (win32_channel->reset_recv);
|
||||||
if (win32_channel->data_avail_event)
|
if (win32_channel->data_avail_event)
|
||||||
CloseHandle (win32_channel->data_avail_event);
|
CloseHandle (win32_channel->data_avail_event);
|
||||||
|
Loading…
Reference in New Issue
Block a user