From mboxrd@z Thu Jan  1 00:00:00 1970
From: Pete Zaitcev <zaitcev@redhat.com>
Subject: [Patch 2/3] cldcli: suppress warnings from -Wshadow
Date: Mon, 3 Aug 2009 19:54:28 -0600
Message-ID: <20090803195428.075142a5@redhat.com>
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Return-path: <hail-devel-owner@vger.kernel.org>
Sender: hail-devel-owner@vger.kernel.org
List-ID: <hail-devel.vger.kernel.org>
Content-Type: text/plain; charset="us-ascii"
To: Jeff Garzik <jeff@garzik.org>, Project Hail List <hail-devel@vger.kernel.org>

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>

diff --git a/tools/cldcli.c b/tools/cldcli.c
index bb5c4cc..90ae601 100644
--- a/tools/cldcli.c
+++ b/tools/cldcli.c
@@ -437,12 +437,12 @@ static bool cld_p_timer_ctl(void *private, bool add,
 static int cld_p_pkt_send(void *priv, const void *addr, size_t addrlen,
 			       const void *buf, size_t buflen)
 {
-	struct cldc_udp *udp = priv;
-	return cldc_udp_pkt_send(udp, addr, addrlen, buf, buflen);
+	struct cldc_udp *udpp = priv;
+	return cldc_udp_pkt_send(udpp, addr, addrlen, buf, buflen);
 }
 
 static void cld_p_event(void *private, struct cldc_session *sess,
-			struct cldc_fh *fh, uint32_t what)
+			struct cldc_fh *fhp, uint32_t what)
 {
 	fprintf(stderr, "FIXME: event\n");
 }