ctdb: Replace calculation of bytes to read from socket by MIN() macro

The calculation of the bytes to read from the socket can be done easier
by the usage of the common MIN() macro.

Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/ctdb/common/ctdb_io.c b/ctdb/common/ctdb_io.c
index da444aca2b69c91db279836e576b54711fa44353..698febd08475fab8919df3a08fb1b3ed499a2c53 100644 (file)
--- a/ctdb/common/ctdb_io.c
+++ b/ctdb/common/ctdb_io.c
@@ -160,7 +160,6 @@ static void queue_io_read(struct ctdb_queue *queue)
        int num_ready = 0;
        ssize_t nread;
        uint8_t *data;
-       int navail;
 
        /* check how much data is available on the socket for immediately
           guaranteed nonblocking access.
@@ -196,10 +195,7 @@ static void queue_io_read(struct ctdb_queue *queue)
                queue->buffer.extend = 0;
        }
 
-       navail = queue->buffer.size - queue->buffer.length;
-       if (num_ready > navail) {
-               num_ready = navail;
-       }
+       num_ready = MIN(num_ready, queue->buffer.size - queue->buffer.length);
 
        if (num_ready > 0) {
                nread = sys_read(queue->fd,