From f3b16286424494e76e6cbfff4468cd55cd3f68eb Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 20 Dec 2012 20:00:11 +0100 Subject: [PATCH] mkswap: fix compiler warnings Signed-off-by: Karel Zak --- disk-utils/mkswap.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c index 0144921e7e..415a9859ba 100644 --- a/disk-utils/mkswap.c +++ b/disk-utils/mkswap.c @@ -316,10 +316,16 @@ check_blocks(void) buffer = xmalloc(pagesize); current_page = 0; while (current_page < PAGES) { + + ssize_t rc; + if (do_seek && lseek(DEV,current_page*pagesize,SEEK_SET) != current_page*pagesize) errx(EXIT_FAILURE, _("seek failed in check_blocks")); - if ((do_seek = (pagesize != read(DEV, buffer, pagesize)))) + + rc = read(DEV, buffer, pagesize); + do_seek = (rc < 0 || (size_t) rc != pagesize); + if (do_seek) page_bad(current_page); current_page++; } -- 2.47.3