From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9369 invoked by alias); 23 Jun 2009 09:46:36 -0000 Received: (qmail 9363 invoked by alias); 23 Jun 2009 09:46:35 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: gfs2-utils: master - gfs_control: fix shadow warnings To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: gfs2-utils.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 5cf2af4d9da2e4830e4d36e15e30cc12e1cde598 X-Git-Newrev: 5c78d91aac53e02f71826d526a0845851fe4bde3 From: "Fabio M. Di Nitto" Message-Id: <20090623092457.9041812037D@lists.fedorahosted.org> Date: Tue, 23 Jun 2009 09:46:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00736.txt.bz2 Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=5c78d91aac53e02f71826d526a0845851fe4bde3 Commit: 5c78d91aac53e02f71826d526a0845851fe4bde3 Parent: 5cf2af4d9da2e4830e4d36e15e30cc12e1cde598 Author: David Teigland AuthorDate: Thu May 7 13:22:29 2009 -0500 Committer: Fabio M. Di Nitto CommitterDate: Tue Jun 23 11:16:07 2009 +0200 gfs_control: fix shadow warnings cluster-stable3/group/gfs_control/main.c: In function <80><98>show_nodeids cluster-stable3/group/gfs_control/main.c:276: warning: declaration of <80><98>n cluster-stable3/group/gfs_control/main.c:36: warning: shadowed declaration is here cluster-stable3/group/gfs_control/main.c: In function <80><98>show_all_nodes cluster-stable3/group/gfs_control/main.c:349: warning: declaration of <80><98>n cluster-stable3/group/gfs_control/main.c:36: warning: shadowed declaration is here and avoid use of an extra variable Signed-off-by: David Teigland --- group/gfs_control/main.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/group/gfs_control/main.c b/group/gfs_control/main.c index 59befcf..d1a3d3e 100644 --- a/group/gfs_control/main.c +++ b/group/gfs_control/main.c @@ -274,9 +274,9 @@ static const char *condition_str(int cond) } } -static void show_nodeids(int count, struct gfsc_node *nodes) +static void show_nodeids(int count, struct gfsc_node *nodes_in) { - struct gfsc_node *n = nodes; + struct gfsc_node *n = nodes_in; int i; for (i = 0; i < count; i++) { @@ -347,9 +347,9 @@ static void show_mg(struct gfsc_mountgroup *mg) show_nodeids(node_count, nodes); } -static void show_all_nodes(int count, struct gfsc_node *nodes) +static void show_all_nodes(int count, struct gfsc_node *nodes_in) { - struct gfsc_node *n = nodes; + struct gfsc_node *n = nodes_in; int i; for (i = 0; i < count; i++) {