[lvm-devel] master - cleanup: clean gcc shadow declaration of version warning

Zdenek Kabelac zkabelac at fedoraproject.org
Thu Nov 26 20:28:17 UTC 2015


Gitweb:        http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=0a00efb0bee2e251a4532d0fdb77da7df0215598
Commit:        0a00efb0bee2e251a4532d0fdb77da7df0215598
Parent:        82ec3e5e93f5017d7c9a83197e34f05e783fa7bf
Author:        Zdenek Kabelac <zkabelac at redhat.com>
AuthorDate:    Thu Nov 26 21:26:55 2015 +0100
Committer:     Zdenek Kabelac <zkabelac at redhat.com>
CommitterDate: Thu Nov 26 21:26:55 2015 +0100

cleanup: clean gcc shadow declaration of version warning

---
 tools/dumpconfig.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/dumpconfig.c b/tools/dumpconfig.c
index 72129c2..85cd619 100644
--- a/tools/dumpconfig.c
+++ b/tools/dumpconfig.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2015 Red Hat, Inc. All rights reserved.
  *
  * This file is part of LVM2.
  *
@@ -17,17 +17,17 @@
 
 static int _get_vsn(struct cmd_context *cmd, uint16_t *version_int)
 {
-	const char *version;
+	const char *vsn;
 	unsigned int major, minor, patchlevel;
 
 	if (arg_count(cmd, atversion_ARG))
-		version = arg_str_value(cmd, atversion_ARG, NULL);
+		vsn = arg_str_value(cmd, atversion_ARG, NULL);
 	else if (arg_count(cmd, sinceversion_ARG))
-		version = arg_str_value(cmd, sinceversion_ARG, NULL);
+		vsn = arg_str_value(cmd, sinceversion_ARG, NULL);
 	else
-		version = LVM_VERSION;
+		vsn = LVM_VERSION;
 
-	if (sscanf(version, "%u.%u.%u", &major, &minor, &patchlevel) != 3) {
+	if (sscanf(vsn, "%u.%u.%u", &major, &minor, &patchlevel) != 3) {
 		log_error("Incorrect version format.");
 		return 0;
 	}




More information about the lvm-devel mailing list