From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30053 invoked by alias); 23 Jun 2009 08:46:29 -0000 Received: (qmail 30046 invoked by alias); 23 Jun 2009 08:46:29 -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: dlm: master - dlm_tool: fix shadow warnings To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: dlm.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: a557ccdf0ef418f7e3a84051d5becb98c866327d X-Git-Newrev: c2048b9fb6b342ce754f479cbda38728de623617 From: "Fabio M. Di Nitto" Message-Id: <20090623082101.21C5E12037D@lists.fedorahosted.org> Date: Tue, 23 Jun 2009 08: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/msg00718.txt.bz2 Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=c2048b9fb6b342ce754f479cbda38728de623617 Commit: c2048b9fb6b342ce754f479cbda38728de623617 Parent: a557ccdf0ef418f7e3a84051d5becb98c866327d Author: David Teigland AuthorDate: Thu May 7 13:20:52 2009 -0500 Committer: Fabio M. Di Nitto CommitterDate: Tue Jun 23 09:43:13 2009 +0200 dlm_tool: fix shadow warnings cluster-stable3/dlm/tool/main.c: In function <80><98>show_nodeids cluster-stable3/dlm/tool/main.c:1082: warning: declaration of <80><98>no cluster-stable3/dlm/tool/main.c:71: warning: shadowed declaration is here cluster-stable3/dlm/tool/main.c: In function <80><98>show_all_nodes cluster-stable3/dlm/tool/main.c:1156: warning: declaration of <80><98>no cluster-stable3/dlm/tool/main.c:71: warning: shadowed declaration is here Signed-off-by: David Teigland --- dlm/tool/main.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlm/tool/main.c b/dlm/tool/main.c index 9fb008a..a972896 100644 --- a/dlm/tool/main.c +++ b/dlm/tool/main.c @@ -1079,9 +1079,9 @@ static int node_compare(const void *va, const void *vb) return a->nodeid - b->nodeid; } -static void show_nodeids(int count, struct dlmc_node *nodes) +static void show_nodeids(int count, struct dlmc_node *nodes_in) { - struct dlmc_node *n = nodes; + struct dlmc_node *n = nodes_in; int i; for (i = 0; i < count; i++) { @@ -1153,9 +1153,9 @@ static int member_int(struct dlmc_node *n) return 0; } -static void show_all_nodes(int count, struct dlmc_node *nodes) +static void show_all_nodes(int count, struct dlmc_node *nodes_in) { - struct dlmc_node *n = nodes; + struct dlmc_node *n = nodes_in; int i; for (i = 0; i < count; i++) {