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

Improve run-time warning messages. Drop some #if 0 code.

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

	* glib/giowin32.c: Improve run-time warning messages. Drop
	some #if 0 code.


svn path=/trunk/; revision=7383
This commit is contained in:
Tor Lillqvist
2008-08-21 11:35:51 +00:00
committed by Tor Lillqvist
parent 2da8893a72
commit 5becc45bf4
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,6 +1,7 @@
2008-08-21 Tor Lillqvist <tml@novell.com> 2008-08-21 Tor Lillqvist <tml@novell.com>
* glib/giowin32.c: Minor comment improvements. * glib/giowin32.c: Minor comment improvements. Improve run-time
warning messages. Drop some #if 0 code.
2008-08-21 Tor Lillqvist <tml@novell.com> 2008-08-21 Tor Lillqvist <tml@novell.com>

19
glib/giowin32.c
View File

@@ -544,10 +544,10 @@ create_thread (GIOWin32Channel *channel,
thread_handle = (HANDLE) _beginthreadex (NULL, 0, thread, channel, 0, thread_handle = (HANDLE) _beginthreadex (NULL, 0, thread, channel, 0,
&channel->thread_id); &channel->thread_id);
if (thread_handle == 0) if (thread_handle == 0)
g_warning (G_STRLOC ": Error creating reader thread: %s", g_warning ("Error creating thread: %s.",
g_strerror (errno)); g_strerror (errno));
else if (!CloseHandle (thread_handle)) else if (!CloseHandle (thread_handle))
g_warning (G_STRLOC ": Error closing thread handle: %s\n", g_warning ("Error closing thread handle: %s.\n",
g_win32_error_message (GetLastError ())); g_win32_error_message (GetLastError ()));
WaitForSingleObject (channel->space_avail_event, INFINITE); WaitForSingleObject (channel->space_avail_event, INFINITE);
@@ -763,7 +763,7 @@ g_io_win32_prepare (GSource *source,
event_mask |= (FD_WRITE | FD_CONNECT); event_mask |= (FD_WRITE | FD_CONNECT);
event_mask |= FD_CLOSE; event_mask |= FD_CLOSE;
if (channel->event_mask != event_mask /* || channel->event != watch->pollfd.fd*/) if (channel->event_mask != event_mask)
{ {
if (channel->debug) if (channel->debug)
g_print ("\n WSAEventSelect(%d,%p,{%s})", g_print ("\n WSAEventSelect(%d,%p,{%s})",
@@ -956,7 +956,7 @@ g_io_win32_dispatch (GSource *source,
if (!func) if (!func)
{ {
g_warning (G_STRLOC ": GIOWin32Watch dispatched without callback\n" g_warning ("IO Watch dispatched without callback\n"
"You must call g_source_connect()."); "You must call g_source_connect().");
return FALSE; return FALSE;
} }
@@ -1001,11 +1001,6 @@ g_io_win32_finalize (GSource *source)
case G_IO_WIN32_SOCKET: case G_IO_WIN32_SOCKET:
if (channel->debug) if (channel->debug)
g_print (" SOCK sock=%d", channel->fd); g_print (" SOCK sock=%d", channel->fd);
#if 0
CloseHandle ((HANDLE) watch->pollfd.fd);
channel->event = 0;
channel->event_mask = 0;
#endif
break; break;
default: default:
@@ -1994,7 +1989,7 @@ g_io_channel_win32_new_fd (gint fd)
if (fstat (fd, &st) == -1) if (fstat (fd, &st) == -1)
{ {
g_warning (G_STRLOC ": %d isn't a C library file descriptor", fd); g_warning ("g_io_channel_win32_new_fd: %d isn't an open file descriptor in the C library GLib uses.", fd);
return NULL; return NULL;
} }
@@ -2044,7 +2039,7 @@ g_io_channel_unix_new (gint fd)
is_socket = (getsockopt (fd, SOL_SOCKET, SO_TYPE, (char *) &optval, &optlen) != SOCKET_ERROR); is_socket = (getsockopt (fd, SOL_SOCKET, SO_TYPE, (char *) &optval, &optlen) != SOCKET_ERROR);
if (is_fd && is_socket) if (is_fd && is_socket)
g_warning (G_STRLOC ": %d is both a file descriptor and a socket, file descriptor interpretation assumed.", fd); g_warning ("g_io_channel_unix_new: %d is both a file descriptor and a socket. File descriptor interpretation assumed. To avoid ambiguity, call either g_io_channel_win32_new_fd() or g_io_channel_win32_new_socket() instead.", fd);
if (is_fd) if (is_fd)
return g_io_channel_win32_new_fd_internal (fd, &st); return g_io_channel_win32_new_fd_internal (fd, &st);
@@ -2052,7 +2047,7 @@ g_io_channel_unix_new (gint fd)
if (is_socket) if (is_socket)
return g_io_channel_win32_new_socket(fd); return g_io_channel_win32_new_socket(fd);
g_warning (G_STRLOC ": %d is neither a file descriptor or a socket", fd); g_warning ("g_io_channel_unix_new: %d is neither a file descriptor or a socket.", fd);
return NULL; return NULL;
} }