cov: remove unused assigns

diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c
index 46470a5fda4bd9c4cbc178fed41d6fe2e2ee4eb7..e681ed8e6266be7acd42e5a51bd462d16917c95c 100644 (file)
--- a/lib/cache/lvmcache.c
+++ b/lib/cache/lvmcache.c
@@ -67,7 +67,6 @@ static DM_LIST_INIT(_vginfos);
 static DM_LIST_INIT(_found_duplicate_devs);
 static DM_LIST_INIT(_unused_duplicate_devs);
 static int _scanning_in_progress = 0;
-static int _has_scanned = 0;
 static int _vgs_locked = 0;
 static int _found_duplicate_pvs = 0;   /* If we never see a duplicate PV we can skip checking for them later. */
 
@@ -1808,8 +1807,6 @@ void lvmcache_destroy(struct cmd_context *cmd, int retain_orphans, int reset)
 {
        log_debug_cache("Dropping VG info");
 
-       _has_scanned = 0;
-
        if (_vgid_hash) {
                dm_hash_destroy(_vgid_hash);
                _vgid_hash = NULL;

diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c
index 9b141fe930e2ae05a11ddc5b49d409b346eba21d..fa92031273151a167a0b9ec8e0a8f5757826a540 100644 (file)
--- a/lib/device/dev-cache.c
+++ b/lib/device/dev-cache.c
@@ -666,10 +666,9 @@ struct dm_list *dev_cache_get_dev_list_for_lvid(const char *lvid)
 
 void dev_cache_failed_path(struct device *dev, const char *path)
 {
-       struct device *dev_by_path;
        struct dm_str_list *strl;
 
-       if ((dev_by_path = (struct device *) dm_hash_lookup(_cache.names, path)))
+       if (dm_hash_lookup(_cache.names, path))
                dm_hash_remove(_cache.names, path);
 
        dm_list_iterate_items(strl, &dev->aliases) {

diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index 3b28bf58306504566f129794733e1d9c09397080..57e184268beb281badeb93e0f775c4dd1b2b30b2 100644 (file)
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -1647,15 +1647,13 @@ struct generic_logical_volume *find_historical_glv(const struct volume_group *vg
 
 int lv_name_is_used_in_vg(const struct volume_group *vg, const char *name, int *historical)
 {
-       struct generic_logical_volume *historical_lv;
-       struct logical_volume *lv;
        int found = 0;
 
-       if ((lv = find_lv(vg, name))) {
+       if (find_lv(vg, name)) {
                found = 1;
                if (historical)
                        *historical = 0;
-       } else if ((historical_lv = find_historical_glv(vg, name, 0, NULL))) {
+       } else if (find_historical_glv(vg, name, 0, NULL)) {
                found = 1;
                if (historical)
                        *historical = 1;

diff --git a/libdm/dm-tools/dmfilemapd.c b/libdm/dm-tools/dmfilemapd.c
index 0b17c2bfa3cb4952003ca402128f30f02974163a..856df3df2dbc02417e726b1ffe8c1a8d37bba429 100644 (file)
--- a/libdm/dm-tools/dmfilemapd.c
+++ b/libdm/dm-tools/dmfilemapd.c
@@ -628,10 +628,10 @@ check_unlinked:
 
 static int _daemonise(struct filemap_monitor *fm)
 {
-       pid_t pid = 0, sid;
+       pid_t pid = 0;
        int fd;
 
-       if (!(sid = setsid())) {
+       if (!setsid()) {
                _early_log("setsid failed.");
                return 0;
        }

diff --git a/tools/pvscan.c b/tools/pvscan.c
index d110a6bd38fac4d60bff3ad002dae3b880ff4063..e3cd410453c1cf22346dfe0934c17b759dabfc39 100644 (file)
--- a/tools/pvscan.c
+++ b/tools/pvscan.c
@@ -452,7 +452,6 @@ static int _online_pvscan_one(struct cmd_context *cmd, struct device *dev,
                              int disable_remove,
                              const char **pvid_without_metadata)
 {
-       struct label *label;
        struct lvmcache_info *info;
        struct _pvscan_baton baton;
        const struct format_type *fmt;
@@ -474,7 +473,7 @@ static int _online_pvscan_one(struct cmd_context *cmd, struct device *dev,
                return 1;
        }
 
-       if (!(label = lvmcache_get_label(info))) {
+       if (!lvmcache_get_label(info)) {
                log_debug("No PV label found for %s.", dev_name(dev));
                if (!disable_remove)
                        _online_pvid_file_remove_devno((int)MAJOR(dev->dev), (int)MINOR(dev->dev));

diff --git a/tools/vgchange.c b/tools/vgchange.c
index 13b72cc8af0f0d9ed4ed2692bd8b959d0d720899..e8e302ce4daa318b2fc4df0fb1a028aa9452c0ec 100644 (file)
--- a/tools/vgchange.c
+++ b/tools/vgchange.c
@@ -607,7 +607,7 @@ static int _vgchange_single(struct cmd_context *cmd, const char *vg_name,
 {
        int ret = ECMD_PROCESSED;
        unsigned i;
-       activation_change_t activate = CHANGE_AN;
+       activation_change_t activate;
 
        static const struct {
                int arg;