diff options
| author | Ben Chan <benchan@chromium.org> | 2014-02-13 12:42:11 -0800 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2014-02-14 09:03:13 +0100 |
| commit | ccbd5a2e2da263de35917d841fdf3bc44a776e52 (patch) | |
| tree | fd95f68507131d16fa93eb3f26ade8116db6d0e1 /src | |
| parent | d278f381d28f6a4ebc82f4f7ea838961ebb466a3 (diff) | |
port-serial: fix gsize/gssize type mismatch
This patch fixes the following type mismatch in MMPortSerial::port_serial_process_command():
mm-port-serial.c:612:21: error: comparison of unsigned expression < 0 is always false [-Werror,-Wtautological-compare]
if (written < 0) {
~~~~~~~ ^ ~
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-port-serial.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mm-port-serial.c b/src/mm-port-serial.c index 47ce482c..e41beefa 100644 --- a/src/mm-port-serial.c +++ b/src/mm-port-serial.c @@ -606,10 +606,11 @@ port_serial_process_command (MMPortSerial *self, /* Socket based setup */ else if (self->priv->socket) { GError *inner_error = NULL; + gssize bytes_sent; /* Send N bytes of the command */ - written = g_socket_send (self->priv->socket, p, send_len, NULL, &inner_error); - if (written < 0) { + bytes_sent = g_socket_send (self->priv->socket, p, send_len, NULL, &inner_error); + if (bytes_sent < 0) { /* Non-EWOULDBLOCK error? */ if (!g_error_matches (inner_error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) { g_propagate_error (error, inner_error); @@ -634,7 +635,8 @@ port_serial_process_command (MMPortSerial *self, /* Just keep on, will retry... */ written = 0; - } + } else + written = bytes_sent; ctx->idx += written; } else |