From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10341 invoked by alias); 11 May 2009 15:44:48 -0000 Received: (qmail 10218 invoked by alias); 11 May 2009 15:44:46 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.0 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: cluster: STABLE3 - dlm_tool: fix shadow warnings To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 9455ac4820ebe74b0ec586b2c7fae983cfe0f5bf X-Git-Newrev: 7afa01274dab81e9a03c90850180d893b27ae230 From: David Teigland Message-Id: <20090511151332.097AB12022C@lists.fedorahosted.org> Date: Mon, 11 May 2009 15:44: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/msg00282.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7afa01274dab81e9a03c90850180d893b27ae230 Commit: 7afa01274dab81e9a03c90850180d893b27ae230 Parent: 9455ac4820ebe74b0ec586b2c7fae983cfe0f5bf Author: David Teigland AuthorDate: Thu May 7 13:20:52 2009 -0500 Committer: David Teigland CommitterDate: Mon May 11 10:05:07 2009 -0500 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 c4d55c4..adb136e 100644 --- a/dlm/tool/main.c +++ b/dlm/tool/main.c @@ -1081,9 +1081,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++) { @@ -1155,9 +1155,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++) {