luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 02:32:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Michael Catanzaro 2024-08-26 10:57:54 -05:00
parent 225854072a
commit 55647c8ada
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glib/giochannel.c
View File

@ -716,12 +716,12 @@ g_io_channel_get_buffer_condition (GIOChannel *channel)
if (channel->encoding) if (channel->encoding)
{ {
if (channel->encoded_read_buf && (channel->encoded_read_buf->len > 0)) if (!channel->encoded_read_buf || channel->encoded_read_buf->len > 0)
condition |= G_IO_IN; /* Only return if we have full characters */ condition |= G_IO_IN; /* Only return if we have full characters */
} }
else else
{ {
if (channel->read_buf && (channel->read_buf->len > 0)) if (!channel->read_buf || channel->read_buf->len > 0)
condition |= G_IO_IN; condition |= G_IO_IN;
} }

18
glib/giounix.c
View File

@ -101,8 +101,6 @@ static GIOStatus g_io_unix_set_flags (GIOChannel *channel,
GError **err); GError **err);
static GIOFlags g_io_unix_get_flags (GIOChannel *channel); static GIOFlags g_io_unix_get_flags (GIOChannel *channel);
static gboolean g_io_unix_prepare (GSource *source,
gint *timeout);
static gboolean g_io_unix_check (GSource *source); static gboolean g_io_unix_check (GSource *source);
static gboolean g_io_unix_dispatch (GSource *source, static gboolean g_io_unix_dispatch (GSource *source,
GSourceFunc callback, GSourceFunc callback,
@ -110,7 +108,7 @@ static gboolean g_io_unix_dispatch (GSource *source,
static void g_io_unix_finalize (GSource *source); static void g_io_unix_finalize (GSource *source);
GSourceFuncs g_io_watch_funcs = { GSourceFuncs g_io_watch_funcs = {
g_io_unix_prepare, NULL,
g_io_unix_check, g_io_unix_check,
g_io_unix_dispatch, g_io_unix_dispatch,
g_io_unix_finalize, g_io_unix_finalize,
@ -128,18 +126,6 @@ static GIOFuncs unix_channel_funcs = {
g_io_unix_get_flags, g_io_unix_get_flags,
}; };
static gboolean
g_io_unix_prepare (GSource *source,
gint *timeout)
{
GIOUnixWatch *watch = (GIOUnixWatch *)source;
GIOCondition buffer_condition = g_io_channel_get_buffer_condition (watch->channel);
/* Only return TRUE here if _all_ bits in watch->condition will be set
*/
return ((watch->condition & buffer_condition) == watch->condition);
}
static gboolean static gboolean
g_io_unix_check (GSource *source) g_io_unix_check (GSource *source)
{ {
@ -147,7 +133,7 @@ g_io_unix_check (GSource *source)
GIOCondition buffer_condition = g_io_channel_get_buffer_condition (watch->channel); GIOCondition buffer_condition = g_io_channel_get_buffer_condition (watch->channel);
GIOCondition poll_condition = watch->pollfd.revents; GIOCondition poll_condition = watch->pollfd.revents;
return ((poll_condition | buffer_condition) & watch->condition); return (poll_condition & watch->condition) && (buffer_condition & watch->condition);
} }
static gboolean static gboolean