]> git.pond.sub.org Git - empserver/commitdiff
client: Rearrange ring_to_iovec() for clarity
authorMarkus Armbruster <armbru@pond.sub.org>
Sun, 25 Jun 2017 08:23:08 +0000 (10:23 +0200)
committerMarkus Armbruster <armbru@pond.sub.org>
Sun, 6 Aug 2017 09:22:29 +0000 (11:22 +0200)
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
src/client/ringbuf.c

index ec79ef86db76976ab81304924cc12e9e54c7fe24..99d1fe30c247b57195a02024ac47defcc5e51e9a 100644 (file)
@@ -229,18 +229,17 @@ ring_to_iovec(struct ring *r, struct iovec iov[])
        return 0;
 
     iov[0].iov_base = r->buf + cons;
-    if (prod <= cons) {
-       /* r->buf[cons..] */
-       iov[0].iov_len = RING_SIZE - cons;
-       /* r->buf[..prod-1] */
-       iov[1].iov_base = r->buf;
-       iov[1].iov_len = prod;
-       return 2;
-    } else {
+    if (prod > cons) {
        /* r->buf[cons..prod-1] */
        iov[0].iov_len = prod - cons;
        return 1;
     }
+    /* r->buf[cons..] */
+    iov[0].iov_len = RING_SIZE - cons;
+    /* r->buf[..prod-1] */
+    iov[1].iov_base = r->buf;
+    iov[1].iov_len = prod;
+    return 2;
 }
 
 /*