ctdb-tests: Add a local variable for repeated calculation

This improves readability.  Also, the asserts involving this
expression get more complicated in the next commit, so this will keep
those asserts within a single line.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/src/ctdb_io_test.c b/ctdb/tests/src/ctdb_io_test.c
index f624d145d1279fbbfe8a0411f74f8fc8a4f79c05..99c63f4de5d3098626ab1a060b01df52b4b1e631 100644 (file)
--- a/ctdb/tests/src/ctdb_io_test.c
+++ b/ctdb/tests/src/ctdb_io_test.c
@@ -253,7 +253,7 @@ static void test4(void)
        struct ctdb_queue *queue;
        uint32_t pkt_size;
        char *request;
-       size_t req_len;
+       size_t req_len, half_buf_size;
        int fd;
        ssize_t ret;
 
@@ -268,8 +268,10 @@ static void test4(void)
        ret = write(fd, &pkt_size, sizeof(pkt_size));
        assert(ret == sizeof(pkt_size));
 
-       ret = write(fd, request, req_len - (queue->buffer_size >> 1));
-       assert(ret == req_len - (queue->buffer_size >> 1));
+       half_buf_size = queue->buffer_size >> 1;
+
+       ret = write(fd, request, req_len - half_buf_size);
+       assert(ret == req_len - half_buf_size);
 
        /*
         * process...
@@ -286,8 +288,8 @@ static void test4(void)
        assert(queue->buffer.size == pkt_size);
 
        /* writing remaining data */
-       ret = write(fd, request, queue->buffer_size >> 1);
-       assert(ret == (queue->buffer_size >> 1));
+       ret = write(fd, request, half_buf_size);
+       assert(ret == half_buf_size);
 
        /* process... */
        tevent_loop_once(ctdb->ev);
@@ -301,13 +303,13 @@ static void test4(void)
        assert(queue->buffer.size == 0);
 
        /* writing new packet to verify standard buffer size */
-       pkt_size = sizeof(uint32_t) + (queue->buffer_size >> 1);
+       pkt_size = sizeof(uint32_t) + half_buf_size;
 
        ret = write(fd, &pkt_size, sizeof(pkt_size));
        assert(ret == sizeof(pkt_size));
 
-       ret = write(fd, request, (queue->buffer_size >> 1));
-       assert(ret == (queue->buffer_size >> 1));
+       ret = write(fd, request, half_buf_size);
+       assert(ret == half_buf_size);
 
        /* process... */
        tevent_loop_once(ctdb->ev);