From: Ken Raeburn <raeburn@mit.edu>
Date: Sun, 4 Sep 2011 04:29:43 +0000 (+0000)
Subject: Rename local variable "socket" to avoid the one shadowed-declaration
X-Git-Tag: krb5-1.10-alpha1~239
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6ed2a96be652c2a65954c3f774c403691bbfd1be;p=krb5.git

Rename local variable "socket" to avoid the one shadowed-declaration
warning I get in a simple GNU/Linux build.  Solaris may have others.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25136 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/rpc/pmap_clnt.c b/src/lib/rpc/pmap_clnt.c
index d4f8ba684..cda40fb29 100644
--- a/src/lib/rpc/pmap_clnt.c
+++ b/src/lib/rpc/pmap_clnt.c
@@ -148,14 +148,14 @@ pmap_unset(
 	rpcvers_t version)
 {
 	struct sockaddr_in myaddress;
-	int socket = -1;
+	int sock = -1;
 	register CLIENT *client;
 	struct pmap parms;
 	bool_t rslt;
 
 	get_myaddress(&myaddress);
 	client = clntudp_bufcreate(&myaddress, PMAPPROG, PMAPVERS,
-	    timeout, &socket, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE);
+	    timeout, &sock, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE);
 	if (client == (CLIENT *)NULL)
 		return (FALSE);
 	parms.pm_prog = program;
@@ -164,6 +164,6 @@ pmap_unset(
 	CLNT_CALL(client, PMAPPROC_UNSET, xdr_pmap, &parms, xdr_bool, &rslt,
 	    tottimeout);
 	CLNT_DESTROY(client);
-	(void)close(socket);
+	(void)close(sock);
 	return (rslt);
 }