From aa251bd6ac0986c5a731fd2b0fd80bcf78652e15 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 2 Mar 2011 05:29:01 -0800 Subject: [PATCH] safe_io: fix signed/unsigned comparisons Signed-off-by: Sage Weil --- src/common/safe_io.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/safe_io.c b/src/common/safe_io.c index 325f2c3b952ff..8ad05a3687efd 100644 --- a/src/common/safe_io.c +++ b/src/common/safe_io.c @@ -22,7 +22,7 @@ ssize_t safe_read(int fd, void *buf, size_t count) { int r; - int cnt = 0; + size_t cnt = 0; while (cnt < count) { r = read(fd, buf, count - cnt); @@ -46,7 +46,7 @@ ssize_t safe_read_exact(int fd, void *buf, size_t count) int ret = safe_read(fd, buf, count); if (ret < 0) return ret; - if (ret != count) + if ((size_t)ret != count) return -EDOM; return 0; } @@ -71,7 +71,7 @@ ssize_t safe_write(int fd, const void *buf, size_t count) ssize_t safe_pread(int fd, void *buf, size_t count, off_t offset) { int r; - int cnt = 0; + size_t cnt = 0; char *b = (char*)buf; while (cnt < count) { @@ -96,7 +96,7 @@ ssize_t safe_pread_exact(int fd, void *buf, size_t count, off_t offset) int ret = safe_pread(fd, buf, count, offset); if (ret < 0) return ret; - if (ret != count) + if ((size_t)ret != count) return -EDOM; return 0; } -- 2.39.5