diff options
Diffstat (limited to 'src/libqmi-glib/qmi-proxy.c')
| -rw-r--r-- | src/libqmi-glib/qmi-proxy.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/libqmi-glib/qmi-proxy.c b/src/libqmi-glib/qmi-proxy.c index f956746..4dd7b31 100644 --- a/src/libqmi-glib/qmi-proxy.c +++ b/src/libqmi-glib/qmi-proxy.c @@ -557,7 +557,7 @@ connection_readable_cb (GSocket *socket, { guint8 buffer[BUFFER_SIZE]; GError *error = NULL; - gssize read; + gssize r; if (condition & G_IO_HUP || condition & G_IO_ERR) { g_debug ("client connection closed"); @@ -568,12 +568,12 @@ connection_readable_cb (GSocket *socket, if (!(condition & G_IO_IN || condition & G_IO_PRI)) return TRUE; - read = g_input_stream_read (g_io_stream_get_input_stream (G_IO_STREAM (client->connection)), - buffer, - BUFFER_SIZE, - NULL, - &error); - if (read < 0) { + r = g_input_stream_read (g_io_stream_get_input_stream (G_IO_STREAM (client->connection)), + buffer, + BUFFER_SIZE, + NULL, + &error); + if (r < 0) { g_warning ("Error reading from istream: %s", error ? error->message : "unknown"); if (error) g_error_free (error); @@ -582,13 +582,13 @@ connection_readable_cb (GSocket *socket, return FALSE; } - if (read == 0) + if (r == 0) return TRUE; - /* else, read > 0 */ + /* else, r > 0 */ if (!G_UNLIKELY (client->buffer)) - client->buffer = g_byte_array_sized_new (read); - g_byte_array_append (client->buffer, buffer, read); + client->buffer = g_byte_array_sized_new (r); + g_byte_array_append (client->buffer, buffer, r); /* Try to parse input messages */ parse_request (client); |