s3:unix_msg: rename a variable buflen->data_len in queue_msg()
authorMichael Adam <obnox@samba.org>
Mon, 29 Sep 2014 09:39:24 +0000 (11:39 +0200)
committerMichael Adam <obnox@samba.org>
Tue, 30 Sep 2014 14:36:10 +0000 (16:36 +0200)
Pair-Programmed-With: Volker Lendecke <vl@samba.org>
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

Signed-off-by: Michael Adam <obnox@samba.org>
Signed-off-by: Volker Lendecke <vl@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
source3/lib/unix_msg/unix_msg.c

index e38bec160f9a89bce92b90c5ca5dac5c4e45b38c..dca2ab151b9bf94ca6d6c43ba45c2bb373460938 100644 (file)
@@ -449,7 +449,7 @@ static int queue_msg(struct unix_dgram_send_queue *q,
                     const int *fds, size_t num_fds)
 {
        struct unix_dgram_msg *msg;
-       ssize_t buflen;
+       ssize_t data_len;
        uint8_t *data_buf;
        size_t msglen;
        size_t fds_size = sizeof(int) * num_fds;
@@ -475,14 +475,14 @@ static int queue_msg(struct unix_dgram_send_queue *q,
                }
        }
 
-       buflen = iov_buflen(iov, iovlen);
-       if (buflen == -1) {
+       data_len = iov_buflen(iov, iovlen);
+       if (data_len == -1) {
                goto invalid;
        }
 
        msglen = offsetof(struct unix_dgram_msg, buf);
-       tmp = msglen + buflen;
-       if ((tmp < msglen) || (tmp < buflen)) {
+       tmp = msglen + data_len;
+       if ((tmp < msglen) || (tmp < data_len)) {
                /* overflow */
                goto invalid;
        }
@@ -514,7 +514,7 @@ static int queue_msg(struct unix_dgram_send_queue *q,
                ret = ENOMEM;
                goto fail;
        }
-       msg->buflen = buflen;
+       msg->buflen = data_len;
        msg->sock = q->sock;
 
        data_buf = msg->buf;