Don't compare syscall return with -1, use "<0" condition.
Don't introduce useless local variables when we already
have similar variable
Rename local variable to be consistent with other usages
Signed-off-by: Michael Tokarev <m...@tls.msk.ru>
---
hw/9pfs/virtio-9p-proxy.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/hw/9pfs/virtio-9p-proxy.c b/hw/9pfs/virtio-9p-proxy.c
index 59c7445..a01804a 100644
--- a/hw/9pfs/virtio-9p-proxy.c
+++ b/hw/9pfs/virtio-9p-proxy.c
@@ -696,9 +696,9 @@ static ssize_t proxy_preadv(FsContext *ctx,
V9fsFidOpenState *fs,
#ifdef CONFIG_PREADV
return preadv(fs->fd, iov, iovcnt, offset);
#else
- int err = lseek(fs->fd, offset, SEEK_SET);
- if (err == -1) {
- return err;
+ int ret = lseek(fs->fd, offset, SEEK_SET);
+ if (err < 0)
+ return ret;
} else {
return readv(fs->fd, iov, iovcnt);
}
@@ -714,10 +714,8 @@ static ssize_t proxy_pwritev(FsContext *ctx,
V9fsFidOpenState *fs,
#ifdef CONFIG_PREADV
ret = pwritev(fs->fd, iov, iovcnt, offset);
#else
- int err = lseek(fs->fd, offset, SEEK_SET);
- if (err == -1) {
- return err;
- } else {
+ ret = lseek(fs->fd, offset, SEEK_SET);
+ if (ret >= 0) {
ret = writev(fs->fd, iov, iovcnt);
}
#endif
--
2.1.4
