cluster: STABLE3 - dlm_tool: fix shadow warnings

David Teigland teigland@fedoraproject.org
Mon May 11 15:44:00 GMT 2009


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7afa01274dab81e9a03c90850180d893b27ae230
Commit:        7afa01274dab81e9a03c90850180d893b27ae230
Parent:        9455ac4820ebe74b0ec586b2c7fae983cfe0f5bf
Author:        David Teigland <teigland@redhat.com>
AuthorDate:    Thu May 7 13:20:52 2009 -0500
Committer:     David Teigland <teigland@redhat.com>
CommitterDate: Mon May 11 10:05:07 2009 -0500

dlm_tool: fix shadow warnings

cluster-stable3/dlm/tool/main.c: In function <E2><80><98>show_nodeids<E2>
cluster-stable3/dlm/tool/main.c:1082: warning: declaration of <E2><80><98>no
cluster-stable3/dlm/tool/main.c:71: warning: shadowed declaration is here
cluster-stable3/dlm/tool/main.c: In function <E2><80><98>show_all_nodes<E2>
cluster-stable3/dlm/tool/main.c:1156: warning: declaration of <E2><80><98>no
cluster-stable3/dlm/tool/main.c:71: warning: shadowed declaration is here

Signed-off-by: David Teigland <teigland@redhat.com>
---
 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++) {



More information about the Cluster-cvs mailing list