From 1f7f7cb701906060ebe38efcadaa74999f16148a Mon Sep 17 00:00:00 2001
From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Fri, 8 Apr 2011 14:40:18 +0000
Subject: [PATCH] Fix some unmatching sign comparation gcc warnings

Simple replacement for unsigned type - usually in for() loops.
---
 WHATS_NEW                     | 1 +
 daemons/clvmd/clvmd-command.c | 2 +-
 daemons/clvmd/clvmd.c         | 2 +-
 daemons/clvmd/refresh_clvmd.c | 2 +-
 lib/activate/fs.c             | 2 +-
 lib/device/dev-swap.c         | 3 ++-
 lib/locking/cluster_locking.c | 2 +-
 lib/metadata/lv_manip.c       | 2 +-
 lib/metadata/metadata.c       | 6 +++---
 lib/metadata/mirror.c         | 4 ++--
 lib/misc/lvm-string.c         | 2 +-
 lib/mm/memlock.c              | 3 ++-
 libdm/libdm-file.c            | 2 +-
 libdm/libdm-report.c          | 8 ++++----
 libdm/regex/matcher.c         | 9 +++++----
 tools/dmsetup.c               | 2 +-
 tools/lvconvert.c             | 2 +-
 tools/lvmcmdline.c            | 2 +-
 18 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/WHATS_NEW b/WHATS_NEW
index 3dd332633..b113ec3d9 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.85 - 
 ===================================
+  Fix some unmatching sign comparation gcc warnings in the code.
   Allow lv_extend() to work on zero length intrinsically layered LVs.
   Keep the cache content when the exported vg buffer is matching.
   Extend the set of memory regions, that are not locked to memory.
diff --git a/daemons/clvmd/clvmd-command.c b/daemons/clvmd/clvmd-command.c
index 0c0a6cbba..d7dad2d2d 100644
--- a/daemons/clvmd/clvmd-command.c
+++ b/daemons/clvmd/clvmd-command.c
@@ -377,7 +377,7 @@ static int restart_clvmd(void)
 	/* Propogate debug options */
 	if (clvmd_get_debug()) {
 		if (!(debug_arg = malloc(16)) ||
-		    dm_snprintf(debug_arg, 16, "-d%d", (int)clvmd_get_debug()) < 0)
+		    dm_snprintf(debug_arg, 16, "-d%u", clvmd_get_debug()) < 0)
 			goto_out;
 		argv[argc++] = debug_arg;
 		debug_arg = NULL;
diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c
index d50213e69..5677d3227 100644
--- a/daemons/clvmd/clvmd.c
+++ b/daemons/clvmd/clvmd.c
@@ -2157,7 +2157,7 @@ static struct local_client *find_client(int clientid)
 {
 	struct local_client *thisfd;
 	for (thisfd = &local_client_head; thisfd != NULL; thisfd = thisfd->next) {
-		if (thisfd->fd == ntohl(clientid))
+		if (thisfd->fd == (int)ntohl(clientid))
 			return thisfd;
 	}
 	return NULL;
diff --git a/daemons/clvmd/refresh_clvmd.c b/daemons/clvmd/refresh_clvmd.c
index 9c0fb4fb9..2a8130d75 100644
--- a/daemons/clvmd/refresh_clvmd.c
+++ b/daemons/clvmd/refresh_clvmd.c
@@ -80,7 +80,7 @@ static int _send_request(const char *inbuf, int inlen, char **retbuf, int no_res
 	char outbuf[PIPE_BUF];
 	struct clvm_header *outheader = (struct clvm_header *) outbuf;
 	int len;
-	int off;
+	unsigned off;
 	int buflen;
 	int err;
 
diff --git a/lib/activate/fs.c b/lib/activate/fs.c
index e39c012b7..a18125ed2 100644
--- a/lib/activate/fs.c
+++ b/lib/activate/fs.c
@@ -327,7 +327,7 @@ static void _del_fs_op(struct fs_op_parms *fsp)
 /* Check if there is other the type of fs operation stacked */
 static int _other_fs_ops(fs_op_t type)
 {
-	int i;
+	unsigned i;
 
 	for (i = 0; i < NUM_FS_OPS; i++)
 		if (type != i && _count_fs_ops[i])
diff --git a/lib/device/dev-swap.c b/lib/device/dev-swap.c
index b8ebcca52..287eafd72 100644
--- a/lib/device/dev-swap.c
+++ b/lib/device/dev-swap.c
@@ -42,7 +42,8 @@ int dev_is_swap(struct device *dev, uint64_t *signature)
 {
 	char buf[10];
 	uint64_t size;
-	int page, ret = 0;
+	unsigned page;
+	int ret = 0;
 
 	if (!dev_get_size(dev, &size)) {
 		stack;
diff --git a/lib/locking/cluster_locking.c b/lib/locking/cluster_locking.c
index 99ac41255..168ebc007 100644
--- a/lib/locking/cluster_locking.c
+++ b/lib/locking/cluster_locking.c
@@ -100,7 +100,7 @@ static int _send_request(char *inbuf, int inlen, char **retbuf)
 	char outbuf[PIPE_BUF] __attribute__((aligned(8)));
 	struct clvm_header *outheader = (struct clvm_header *) outbuf;
 	int len;
-	int off;
+	unsigned off;
 	int buflen;
 	int err;
 
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 7eb43b74c..bc3d42f14 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -976,7 +976,7 @@ static int _for_each_pv(struct cmd_context *cmd, struct logical_volume *lv,
 					       (le - seg->le) / area_multiple,
 					       area_len, NULL, max_seg_len, 0,
 					       (stripes_per_mimage == 1) && only_single_area_segments ? 1U : 0U,
-					       top_level_area_index != -1 ? top_level_area_index : (int) s * stripes_per_mimage,
+					       (top_level_area_index != -1) ? top_level_area_index : (int) (s * stripes_per_mimage),
 					       only_single_area_segments, fn,
 					       data)))
 				stack;
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index b4f29b3f6..47a2d98ac 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -1987,7 +1987,7 @@ static int _lv_each_dependency(struct logical_volume *lv,
 			       int (*fn)(struct logical_volume *lv, void *data),
 			       void *data)
 {
-	int i, s;
+	unsigned i, s;
 	struct lv_segment *lvseg;
 
 	struct logical_volume *deps[] = {
@@ -2111,7 +2111,7 @@ static int _lv_mark_if_partial_collect(struct logical_volume *lv, void *data)
 
 static int _lv_mark_if_partial_single(struct logical_volume *lv, void *data)
 {
-	int s;
+	unsigned s;
 	struct _lv_mark_if_partial_baton baton;
 	struct lv_segment *lvseg;
 
@@ -2200,7 +2200,7 @@ static int _lv_validate_references_single(struct logical_volume *lv, void *data)
 	struct validate_hash *vhash = data;
 	struct lv_segment *lvseg;
 	struct physical_volume *pv;
-	int s;
+	unsigned s;
 	int r = 1;
 
 	if (lv != dm_hash_lookup_binary(vhash->lvid, &lv->lvid.id[1],
diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c
index 9a4797da9..e4aa808c1 100644
--- a/lib/metadata/mirror.c
+++ b/lib/metadata/mirror.c
@@ -200,7 +200,7 @@ uint32_t adjusted_mirror_region_size(uint32_t extent_size, uint32_t extents,
  */
 int shift_mirror_images(struct lv_segment *mirrored_seg, unsigned mimage)
 {
-	int i;
+	unsigned i;
 	struct lv_segment_area area;
 
 	if (mimage >= mirrored_seg->area_count) {
@@ -1836,7 +1836,7 @@ int add_mirror_log(struct cmd_context *cmd, struct logical_volume *lv,
 	int in_sync;
 	struct logical_volume *log_lv;
 	struct lvinfo info;
-	int old_log_count;
+	unsigned old_log_count;
 	int r = 0;
 
 	if (dm_list_size(&lv->segments) != 1) {
diff --git a/lib/misc/lvm-string.c b/lib/misc/lvm-string.c
index 8fd2c041e..97985d6e7 100644
--- a/lib/misc/lvm-string.c
+++ b/lib/misc/lvm-string.c
@@ -144,7 +144,7 @@ static void _unquote_one_character(char *src, const char orig_char,
  * process several characters in one go.
  */
 static void _unquote_characters(char *src, const char *orig_chars,
-				const int num_orig_chars, 
+				size_t num_orig_chars,
 				const char quote_char,
 				char *arr_substr_first_unquoted[])
 {
diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c
index 1fb2d03c0..70abb1c05 100644
--- a/lib/mm/memlock.c
+++ b/lib/mm/memlock.c
@@ -151,7 +151,8 @@ static int _maps_line(const struct config_node *cn, lvmlock_t lock,
 {
 	const struct config_value *cv;
 	long from, to;
-	int pos, i;
+	int pos;
+	unsigned i;
 	char fr, fw, fx, fp;
 	size_t sz;
 
diff --git a/libdm/libdm-file.c b/libdm/libdm-file.c
index 82fae3428..4edead9d3 100644
--- a/libdm/libdm-file.c
+++ b/libdm/libdm-file.c
@@ -149,7 +149,7 @@ retry_fcntl:
 		goto fail_close_unlink;
 	}
 
-	if ((write_out == 0) || (write_out < bufferlen)) {
+	if ((write_out == 0) || ((size_t)write_out < bufferlen)) {
 		log_error("Cannot write pid to pidfile [%s], shortwrite of"
 			  "[%" PRIsize_t "] bytes, expected [%" PRIsize_t "]\n",
 			  lockfile, write_out, bufferlen);
diff --git a/libdm/libdm-report.c b/libdm/libdm-report.c
index 19f57362f..dca69c848 100644
--- a/libdm/libdm-report.c
+++ b/libdm/libdm-report.c
@@ -734,8 +734,8 @@ int dm_report_object(struct dm_report *rh, void *object)
 			return 0;
 		}
 
-		if ((strlen(field->report_string) > field->props->width))
-			field->props->width = strlen(field->report_string);
+		if (((int) strlen(field->report_string) > field->props->width))
+			field->props->width = (int) strlen(field->report_string);
 
 		if ((rh->flags & RH_SORT_REQUIRED) &&
 		    (field->props->flags & FLD_SORT_KEY)) {
@@ -775,8 +775,8 @@ static int _report_headings(struct dm_report *rh)
 	}
 
 	dm_list_iterate_items(fp, &rh->field_props) {
-		if (buf_size < fp->width)
-			buf_size = fp->width;
+		if ((int) buf_size < fp->width)
+			buf_size = (size_t) fp->width;
 	}
 	/* Including trailing '\0'! */
 	buf_size++;
diff --git a/libdm/regex/matcher.c b/libdm/regex/matcher.c
index 959086586..0495ae68f 100644
--- a/libdm/regex/matcher.c
+++ b/libdm/regex/matcher.c
@@ -100,7 +100,7 @@ static void _fill_table(struct dm_regex *m, struct rx_node *rx)
 
 static void _create_bitsets(struct dm_regex *m)
 {
-	int i;
+	unsigned i;
 
 	for (i = 0; i < m->num_nodes; i++) {
 		struct rx_node *n = m->nodes[i];
@@ -112,7 +112,7 @@ static void _create_bitsets(struct dm_regex *m)
 
 static void _calc_functions(struct dm_regex *m)
 {
-	int i, j, final = 1;
+	unsigned i, j, final = 1;
 	struct rx_node *rx, *c1, *c2;
 
 	for (i = 0; i < m->num_nodes; i++) {
@@ -253,7 +253,8 @@ static int _calc_states(struct dm_regex *m, struct rx_node *rx)
 {
 	unsigned iwidth = (m->num_charsets / DM_BITS_PER_INT) + 1;
 	struct dfa_state *dfa;
-	int i, a;
+	unsigned i;
+	int a;
 
 	m->tt = ttree_create(m->scratch, iwidth);
 	if (!m->tt)
@@ -314,7 +315,7 @@ struct dm_regex *dm_regex_create(struct dm_pool *mem, const char * const *patter
 				 unsigned num_patterns)
 {
 	char *all, *ptr;
-	int i;
+	unsigned i;
 	size_t len = 0;
 	struct rx_node *rx;
 	struct dm_regex *m;
diff --git a/tools/dmsetup.c b/tools/dmsetup.c
index 362d7e75d..db9ad1b70 100644
--- a/tools/dmsetup.c
+++ b/tools/dmsetup.c
@@ -2412,7 +2412,7 @@ static int _dm_deps_disp(struct dm_report *rh, struct dm_pool *mem,
 			 void *private)
 {
 	const struct dm_deps *deps = data;
-	int i;
+	unsigned i;
 	char buf[DM_MAX_TYPE_NAME], *repstr;
 
 	if (!dm_pool_begin_object(mem, 16)) {
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index efc53e2d4..49d39cfd8 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -555,7 +555,7 @@ static int _failed_mirrors_count(struct logical_volume *lv)
 {
 	struct lv_segment *lvseg;
 	int ret = 0;
-	int s;
+	unsigned s;
 
 	dm_list_iterate_items(lvseg, &lv->segments) {
 		if (!seg_is_mirrored(lvseg))
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index fe5f08e5a..ddf0b5ed4 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1274,7 +1274,7 @@ static void _close_stray_fds(const char *command)
 	if (getenv("LVM_SUPPRESS_FD_WARNINGS"))
 		suppress_warnings = 1;
 
-	for (fd = 3; fd < rlim.rlim_cur; fd++)
+	for (fd = 3; fd < (int)rlim.rlim_cur; fd++)
 		_close_descriptor(fd, suppress_warnings, command, ppid,
 				  parent_cmdline);
 }
-- 
2.43.5