client: fix bad shadowing of 'ret'
authorJens Axboe <axboe@kernel.dk>
Sun, 8 Apr 2018 21:46:17 +0000 (15:46 -0600)
committerJens Axboe <axboe@kernel.dk>
Sun, 8 Apr 2018 21:46:17 +0000 (15:46 -0600)
Different scopes for ret, introduce 'wrote' to check the
return value of write(2).

Signed-off-by: Jens Axboe <axboe@kernel.dk>
client.c

index 970974a00f274ee6e1640c84c1145c13a146c54c..ea1a4d292d9899abf1b0bd9638673b020a08fbda 100644 (file)
--- a/client.c
+++ b/client.c
@@ -1339,7 +1339,7 @@ static int fio_client_handle_iolog(struct fio_client *client,
        sprintf(log_pathname, "%s.%s", pdu->name, client->hostname);
 
        if (store_direct) {
-               ssize_t ret;
+               ssize_t wrote;
                size_t sz;
                int fd;
 
@@ -1353,10 +1353,10 @@ static int fio_client_handle_iolog(struct fio_client *client,
                }
 
                sz = cmd->pdu_len - sizeof(*pdu);
-               ret = write(fd, pdu->samples, sz);
+               wrote = write(fd, pdu->samples, sz);
                close(fd);
 
-               if (ret != sz) {
+               if (wrote != sz) {
                        log_err("fio: short write on compressed log\n");
                        ret = 1;
                        goto out;