Fix some unmatching sign comparation gcc warnings

Simple replacement for unsigned type - usually in for() loops.

diff --git a/WHATS_NEW b/WHATS_NEW
index 3dd332633151485f54f314a7f794fd59fc9784bd..b113ec3d98efb2ad2c08e8b64a10587c74fbc75b 100644 (file)
--- 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 0c0a6cbba58d391e773cdcf1e624e4db8707e2ee..d7dad2d2d7fbc68df171a3e05b1f49ea6efe644a 100644 (file)
--- 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 d50213e69b60699114d6748a43b1b9f019247898..5677d322771e97f3354d9c0d19d1e7d261ecf0fd 100644 (file)
--- 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 9c0fb4fb90194f27538302a829fd968c0c6d9b7a..2a8130d75d9d5f3b68ec6e43908eeda886cc7417 100644 (file)
--- 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 e39c012b7b3e662e79216e7a995b7c9005bfcdb2..a18125ed29b2ff2650925bb3af698d5f6db71b87 100644 (file)
--- 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 b8ebcca52c376b012cb9e679dc2727a8dca3bcdb..287eafd72fa88e9f6b716104adbfa3f2bf0edecc 100644 (file)
--- 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 99ac41255813d22227ce8aabbb712f89831b3288..168ebc007e2e8231f4c1522e5e0bf33535dd66d8 100644 (file)
--- 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 7eb43b74cc577a42f0768d75dca9311b085b43d8..bc3d42f14ba2cf9ba1ee0f6b1a65629d77c415ec 100644 (file)
--- 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 b4f29b3f605c6ccda3c39254a56532d980756583..47a2d98ac04d03406dd3326a7080be54ba28d83f 100644 (file)
--- 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 9a4797da919212501fec33aba47d0fd2053b8dc5..e4aa808c10b60b3359f058e3c05bb167594748a1 100644 (file)
--- 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 8fd2c041e3ee53df2e64800716dbba8cfcde2650..97985d6e75c76831f7a6d26ecc7fbef64a297c12 100644 (file)
--- 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 1fb2d03c08623f96825420606386a2e0f23f3c7f..70abb1c05bd3ada13c3798c5c2d260dc1f827d86 100644 (file)
--- 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 82fae342859ec97a1de014e53a4882667212b071..4edead9d37ca1084adc91d95874e9dd50a888b5f 100644 (file)
--- 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 19f57362f6dfa3310283dc722f479f9228f39e68..dca69c848a33413e879f45fcdfae6b468ce81aec 100644 (file)
--- 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 9590865861ff2c0dfecd9cd7fe9f484136946e3d..0495ae68f93eef835aefe23ac9b2745775475c9a 100644 (file)
--- 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 362d7e75d2302d7f8282474169814150b5f468a9..db9ad1b70e6e506203f975547b4af25328c78a4a 100644 (file)
--- 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 efc53e2d43bc1848ca5b4f8c4bd34c3c2a520bc4..49d39cfd8392cd475dcda289a508713e2c1ab751 100644 (file)
--- 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 fe5f08e5aeaea117189fd84663f791ecedd3b85b..ddf0b5ed4ba29f1485a47e3405b45c41ffa545c5 100644 (file)
--- 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);
 }