From 77ad97f199f1bf05e9a7609bbdd239dab825b258 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko
Date: Tue, 13 May 2008 02:27:31 +0000
Subject: more -Wall warning fixes from Cristian Ionescu-Idbohrn. This time it
 resulted in small code changes:

function                                             old     new   delta
nexpr                                                820     828      +8
tail_main                                           1200    1202      +2
wrapf                                                166     167      +1
parse_mount_options                                  227     209     -18
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/1 up/down: 11/-18)             Total: -7 bytes

---
 util-linux/volume_id/util.c      | 4 ++--
 util-linux/volume_id/volume_id.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'util-linux/volume_id')

diff --git a/util-linux/volume_id/util.c b/util-linux/volume_id/util.c
index ce7de23..240b3c1 100644
--- a/util-linux/volume_id/util.c
+++ b/util-linux/volume_id/util.c
@@ -212,7 +212,7 @@ void *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len)
 			}
 			dbg("got 0x%zx (%zi) bytes", buf_len, buf_len);
 			id->sbbuf_len = buf_len;
-			if (buf_len < off + len) {
+			if ((uint64_t)buf_len < off + len) {
 				dbg("requested 0x%zx bytes, got only 0x%zx bytes", len, buf_len);
 				return NULL;
 			}
@@ -243,7 +243,7 @@ void *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len)
 		dbg("got 0x%zx (%zi) bytes", buf_len, buf_len);
 		id->seekbuf_off = off;
 		id->seekbuf_len = buf_len;
-		if (buf_len < len) {
+		if ((size_t)buf_len < len) {
 			dbg("requested 0x%zx bytes, got only 0x%zx bytes", len, buf_len);
 			return NULL;
 		}
diff --git a/util-linux/volume_id/volume_id.c b/util-linux/volume_id/volume_id.c
index de9aae2..aec96a2 100644
--- a/util-linux/volume_id/volume_id.c
+++ b/util-linux/volume_id/volume_id.c
@@ -152,7 +152,7 @@ static const probe_fptr fs2[] = {
 
 int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size)
 {
-	int i;
+	size_t i;
 
 	if (id == NULL)
 		return -EINVAL;
-- 
cgit v1.1