luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gsocket: don't abuse GPollFD.revents field

Browse Source 
We are reusing the GPollFD.revents field of the source to store a
temporary value.  Use a local variable for that instead.

This is a refactor to make the next commit easier to understand.

https://bugzilla.gnome.org/show_bug.cgi?id=724707
This commit is contained in:
Ryan Lortie 2014-02-13 16:58:34 -05:00
parent ff96f88e17
commit 1f7100506a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gio/gsocket.c
View File

@ -3259,17 +3259,19 @@ socket_source_dispatch (GSource *source,
GSocketSourceFunc func = (GSocketSourceFunc)callback;
GSocketSource *socket_source = (GSocketSource *)source;
GSocket *socket = socket_source->socket;
guint events;
gboolean ret;
#ifdef G_OS_WIN32
socket_source->pollfd.revents = update_condition (socket_source->socket);
events = update_condition (socket_source->socket);
#else
events = socket_source->pollfd.revents;
#endif
if (socket_source->socket->priv->timed_out)
socket_source->pollfd.revents |= socket_source->condition & (G_IO_IN | G_IO_OUT);
ret = (*func) (socket,
socket_source->pollfd.revents & socket_source->condition,
user_data);
if (socket_source->socket->priv->timed_out)
events |= socket_source->condition & (G_IO_IN | G_IO_OUT);
ret = (*func) (socket, events & socket_source->condition, user_data);
if (socket->priv->timeout)
socket_source->timeout_time = g_get_monotonic_time () +