summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2019-11-01 19:35:28 +0100
committerZdenek Kabelac <zkabelac@redhat.com>2019-11-11 22:44:18 +0100
commit8679d45917c321ea76c48c150395db833ba7b812 (patch)
treec7c32eaf52cb75fe7ef8d9566ff6b55bc9d822f3
parente184f77109d973297fa80edaa8dca7447b64b40e (diff)
downloadlvm2-8679d45917c321ea76c48c150395db833ba7b812.tar.gz
gcc: avoid declaration shadowing
dev_name is global in device.h
-rw-r--r--lib/activate/dev_manager.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index 1adb44d7b..51ba298b9 100644
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -259,7 +259,7 @@ static int _info_run(const char *dlid, struct dm_info *dminfo,
void *target = NULL;
uint64_t target_start, target_length, start, length;
char *target_name, *target_params;
- const char *dev_name;
+ const char *devname;
if (seg_status) {
dmtask = DM_DEVICE_STATUS;
@@ -274,8 +274,8 @@ static int _info_run(const char *dlid, struct dm_info *dminfo,
return_0;
if (name_check && dminfo->exists &&
- (dev_name = dm_task_get_name(dmt)) &&
- (strcmp(name_check, dev_name) != 0))
+ (devname = dm_task_get_name(dmt)) &&
+ (strcmp(name_check, devname) != 0))
dminfo->exists = 0; /* mismatching name -> device does not exist */
if (with_read_ahead && dminfo->exists) {