From 6e6c72746fc058d8b1ecfa9479b81aec9d5a532e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Gallou=C3=ABt?= Date: Tue, 2 Apr 2019 14:02:32 +0000 Subject: [PATCH] Fix conversion in src/tun.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Adrien Gallouët --- src/tun.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/tun.c b/src/tun.c index 8130b5c..d519542 100644 --- a/src/tun.c +++ b/src/tun.c @@ -129,10 +129,9 @@ static int tun_create_by_name(char *name, size_t len, const char *dev_name) { char tmp[128]; - int ret = snprintf(tmp, sizeof(tmp), "/dev/%s", dev_name); - if (ret <= 0 || ret >= sizeof(tmp)) { + if (ret <= 0 || (size_t)ret >= sizeof(tmp)) { errno = EINVAL; return -1; } @@ -153,10 +152,9 @@ static int tun_create_by_id(char *name, size_t len, unsigned id) { char tmp[64]; - int ret = snprintf(tmp, sizeof(tmp), "tun%u", id); - if (ret <= 0 || ret >= sizeof(tmp)) { + if (ret <= 0 || (size_t)ret >= sizeof(tmp)) { errno = EINVAL; return -1; } @@ -201,17 +199,17 @@ tun_read(int fd, void *data, size_t size) }, }; - ssize_t ret = readv(fd, iov, 2); + int ret = (int)readv(fd, iov, 2); - if (ret <= (ssize_t)0) + if (ret <= 0) return ret; - if (ret <= (ssize_t)sizeof(family)) + if ((size_t)ret <= sizeof(family)) return 0; - return ret - sizeof(family); + return ret - (int)sizeof(family); #else - return read(fd, data, size); + return (int)read(fd, data, size); #endif } @@ -247,17 +245,17 @@ tun_write(int fd, const void *data, size_t size) }, }; - ssize_t ret = writev(fd, iov, 2); + int ret = (int)writev(fd, iov, 2); - if (ret <= (ssize_t)0) + if (ret <= 0) return ret; - if (ret <= (ssize_t)sizeof(family)) + if ((size_t)ret <= sizeof(family)) return 0; - return ret - sizeof(family); + return ret - (int)sizeof(family); #else - return write(fd, data, size); + return (int)write(fd, data, size); #endif }