gcc: use apropriate type for reading and printing values

diff --git a/device_mapper/ioctl/libdm-iface.c b/device_mapper/ioctl/libdm-iface.c
index 25e7d1a752a6f85c5a2bdb55950a85c76a476524..8e72406731d7b54be96ca9f96dac25f9f1ac70cc 100644 (file)
--- a/device_mapper/ioctl/libdm-iface.c
+++ b/device_mapper/ioctl/libdm-iface.c
@@ -205,7 +205,7 @@ static int _get_proc_number(const char *file, const char *name,
        }
 
        while (getline(&line, &len, fl) != -1) {
-               if (sscanf(line, "%d %255s\n", &num, &nm[0]) == 2) {
+               if (sscanf(line, "%u %255s\n", &num, &nm[0]) == 2) {
                        if (!strcmp(name, nm)) {
                                if (number) {
                                        *number = num;

diff --git a/device_mapper/libdm-common.c b/device_mapper/libdm-common.c
index bc691d62977026d9854686794928f2a63214383f..b6d08f5571f70c1dd4b3177fee444fb31c605472 100644 (file)
--- a/device_mapper/libdm-common.c
+++ b/device_mapper/libdm-common.c
@@ -512,7 +512,7 @@ int unmangle_string(const char *str, const char *str_name, size_t len,
        int strict = mode != DM_STRING_MANGLING_NONE;
        char str_rest[DM_NAME_LEN];
        size_t i, j;
-       int code;
+       unsigned int code;
        int r = 0;
 
        if (!str || !buf)

diff --git a/device_mapper/mm/pool.c b/device_mapper/mm/pool.c
index b6478c54b45d7c37540e4522c49c432182791759..18df7ca1e33f5fcc69d0b055d7e82af20857f972 100644 (file)
--- a/device_mapper/mm/pool.c
+++ b/device_mapper/mm/pool.c
@@ -98,7 +98,7 @@ void dm_pools_check_leaks(void)
                          p->orig_pool,
                          p->name, p->stats.bytes);
 #else
-               log_error(" [%p] %s", p, p->name);
+               log_error(" [%p] %s", (void *)p, p->name);
 #endif
        }
        pthread_mutex_unlock(&_dm_pools_mutex);

diff --git a/lib/label/hints.c b/lib/label/hints.c
index efa02f7c588663328ea23bf600d3aad52b9fea7d..fdc0bd6c04afffb193ee6f461101ada6742ebec1 100644 (file)
--- a/lib/label/hints.c
+++ b/lib/label/hints.c
@@ -737,7 +737,7 @@ static int _read_hint_file(struct cmd_context *cmd, struct dm_list *hints, int *
 
                keylen = strlen("scan_lvs:");
                if (!strncmp(_hint_line, "scan_lvs:", keylen)) {
-                       int scan_lvs = 0;
+                       unsigned scan_lvs = 0;
                        if ((sscanf(_hint_line + keylen, "%u", &scan_lvs) != 1) ||
                            scan_lvs != cmd->scan_lvs) {
                                log_debug("ignore hints with different or unreadable scan_lvs");

diff --git a/lib/label/label.c b/lib/label/label.c
index 4d37ceff67a5518c25494dc0b4d7dc1964b0e4e3..4d369d4f14bd92cd57327c0dca302357f84520a0 100644 (file)
--- a/lib/label/label.c
+++ b/lib/label/label.c
@@ -716,7 +716,7 @@ static int _scan_list(struct cmd_context *cmd, struct dev_filter *f,
                                       dev_name(devl->dev),
                                       (int)MAJOR(devl->dev->dev),
                                       (int)MINOR(devl->dev->dev),
-                                      devl->dev->bcache_fd, bb);
+                                      devl->dev->bcache_fd, (void *)bb);
 
                        ret = _process_block(cmd, f, devl->dev, bb, 0, 0, &is_lvm_device);
 

diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index c0d42066daaa06b0414bcc58bec9b5c873ff51ec..4777d7923d66e40a3a2feea83cf8d067de2e4838 100644 (file)
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -5239,9 +5239,9 @@ struct volume_group *vg_read(struct cmd_context *cmd, const char *vg_name, const
                dm_config_destroy(cft);
        } else {
                if (vg->vg_precommitted)
-                       log_error(INTERNAL_ERROR "vg_read vg %p vg_precommitted %p", vg, vg->vg_precommitted);
+                       log_error(INTERNAL_ERROR "vg_read vg %p vg_precommitted %p", (void *)vg, (void *)vg->vg_precommitted);
                if (vg->vg_committed)
-                       log_error(INTERNAL_ERROR "vg_read vg %p vg_committed %p", vg, vg->vg_committed);
+                       log_error(INTERNAL_ERROR "vg_read vg %p vg_committed %p", (void *)vg, (void *)vg->vg_committed);
        }
 out:
        /* We return with the VG lock held when read is successful. */
@@ -5265,9 +5265,9 @@ bad:
         */
        if (error_vg && vg) {
                if (vg->vg_precommitted)
-                       log_error(INTERNAL_ERROR "vg_read vg %p vg_precommitted %p", vg, vg->vg_precommitted);
+                       log_error(INTERNAL_ERROR "vg_read vg %p vg_precommitted %p", (void *)vg, (void *)vg->vg_precommitted);
                if (vg->vg_committed)
-                       log_error(INTERNAL_ERROR "vg_read vg %p vg_committed %p", vg, vg->vg_committed);
+                       log_error(INTERNAL_ERROR "vg_read vg %p vg_committed %p", (void *)vg, (void *)vg->vg_committed);
 
                /* caller must unlock_vg and release_vg */
                *error_vg = vg;

diff --git a/lib/metadata/vg.c b/lib/metadata/vg.c
index beddf73deba201ee98660a1b911c2cf18986c691..a809115f694cc36b405b3b7bb47ddc83074f6864 100644 (file)
--- a/lib/metadata/vg.c
+++ b/lib/metadata/vg.c
@@ -61,7 +61,7 @@ struct volume_group *alloc_vg(const char *pool_name, struct cmd_context *cmd,
        dm_list_init(&vg->removed_historical_lvs);
        dm_list_init(&vg->removed_pvs);
 
-       log_debug_mem("Allocated VG %s at %p.", vg->name ? : "<no name>", vg);
+       log_debug_mem("Allocated VG %s at %p.", vg->name ? : "<no name>", (void *)vg);
 
        return vg;
 }
@@ -76,7 +76,7 @@ static void _free_vg(struct volume_group *vg)
                return;
        }
 
-       log_debug_mem("Freeing VG %s at %p.", vg->name ? : "<no name>", vg);
+       log_debug_mem("Freeing VG %s at %p.", vg->name ? : "<no name>", (void *)vg);
 
        dm_hash_destroy(vg->hostnames);
        dm_pool_destroy(vg->vgmem);

diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c
index aa47d665be8685ae6b90137f94aba6f144747372..b06bbc82c1e8a93dfb0616f1d501aa920073d13f 100644 (file)
--- a/lib/mm/memlock.c
+++ b/lib/mm/memlock.c
@@ -232,7 +232,7 @@ static int _maps_line(const struct dm_config_node *cn, lvmlock_t lock,
                      const char *line, size_t *mstats)
 {
        const struct dm_config_value *cv;
-       long from, to;
+       unsigned long from, to;
        int pos;
        unsigned i;
        char fr, fw, fx, fp;

diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c
index 7ad549c915023758cd83afb3d1966d45c51930bd..f4be478da4e9f1762860cbfcecb295c50c851b74 100644 (file)
--- a/libdm/ioctl/libdm-iface.c
+++ b/libdm/ioctl/libdm-iface.c
@@ -204,7 +204,7 @@ static int _get_proc_number(const char *file, const char *name,
        }
 
        while (getline(&line, &len, fl) != -1) {
-               if (sscanf(line, "%d %255s\n", &num, &nm[0]) == 2) {
+               if (sscanf(line, "%u %255s\n", &num, &nm[0]) == 2) {
                        if (!strcmp(name, nm)) {
                                if (number) {
                                        *number = num;

diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c
index d75c7046c811e3b755a00a667c09c7758ef22b1e..466c74bb9722553b99b876cdfb7b638b382e7142 100644 (file)
--- a/libdm/libdm-common.c
+++ b/libdm/libdm-common.c
@@ -510,7 +510,7 @@ int unmangle_string(const char *str, const char *str_name, size_t len,
        int strict = mode != DM_STRING_MANGLING_NONE;
        char str_rest[DM_NAME_LEN];
        size_t i, j;
-       int code;
+       unsigned int code;
        int r = 0;
 
        if (!str || !buf)

diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c
index 420e3e181c3e4ed1663cc43605efc066b75cca2e..05971bdad1aee79b9e7723aa4596c7ef5a0a32de 100644 (file)
--- a/libdm/libdm-stats.c
+++ b/libdm/libdm-stats.c
@@ -403,7 +403,7 @@ static int _stats_bound(const struct dm_stats *dms)
        if (dms->bind_major > 0 || dms->bind_name || dms->bind_uuid)
                return 1;
        /* %p format specifier expects a void pointer. */
-       log_error("Stats handle at %p is not bound.", dms);
+       log_error("Stats handle at %p is not bound.", (const void *)dms);
        return 0;
 }
 

diff --git a/libdm/mm/pool.c b/libdm/mm/pool.c
index 26f43a787eabe14b604ee0d1a3e0ef79f511f465..f3e1d1a340b522759a7a24ba0daa47224961cf51 100644 (file)
--- a/libdm/mm/pool.c
+++ b/libdm/mm/pool.c
@@ -98,7 +98,7 @@ void dm_pools_check_leaks(void)
                          p->orig_pool,
                          p->name, p->stats.bytes);
 #else
-               log_error(" [%p] %s", p, p->name);
+               log_error(" [%p] %s", (void *)p, p->name);
 #endif
        }
        pthread_mutex_unlock(&_dm_pools_mutex);