From: Eric Blake <eblake@redhat.com>
Date: Wed, 27 Apr 2011 15:52:00 +0000 (-0600)
Subject: passfd: avoid compiler warning
X-Git-Tag: v0.1~2899
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=722fc0acd0be939543544f6eaa66a9750a69d4a0;p=gnulib.git

passfd: avoid compiler warning

Detected on Fedora 13 with -Wshadow.

* lib/passfd.c (sendfd, recvfd): Avoid shadowing names.
Reported by Laine Stump.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index 21ce7d7fd..f1006b5f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-27  Eric Blake  <eblake@redhat.com>
+
+	passfd: avoid compiler warning
+	* lib/passfd.c (sendfd, recvfd): Avoid shadowing names.
+	Reported by Laine Stump.
+
 2011-04-27  J.T. Conklin  <jtc@acorntoolworks.com>  (tiny change)
 
 	* gnulib-tool: change "join -a 2" to "join -a2", the latter is
diff --git a/lib/passfd.c b/lib/passfd.c
index a4d884107..86c73760b 100644
--- a/lib/passfd.c
+++ b/lib/passfd.c
@@ -43,7 +43,7 @@
 int
 sendfd (int sock, int fd)
 {
-  char send = 0;
+  char byte = 0;
   struct iovec iov;
   struct msghdr msg;
 # ifdef CMSG_FIRSTHDR
@@ -53,7 +53,7 @@ sendfd (int sock, int fd)
 
   /* send at least one char */
   memset (&msg, 0, sizeof msg);
-  iov.iov_base = &send;
+  iov.iov_base = &byte;
   iov.iov_len = 1;
   msg.msg_iov = &iov;
   msg.msg_iovlen = 1;
@@ -100,7 +100,7 @@ sendfd (int sock _GL_UNUSED, int fd _GL_UNUSED)
 int
 recvfd (int sock, int flags)
 {
-  char recv = 0;
+  char byte = 0;
   struct iovec iov;
   struct msghdr msg;
   int fd = -1;
@@ -118,7 +118,7 @@ recvfd (int sock, int flags)
 
   /* send at least one char */
   memset (&msg, 0, sizeof msg);
-  iov.iov_base = &recv;
+  iov.iov_base = &byte;
   iov.iov_len = 1;
   msg.msg_iov = &iov;
   msg.msg_iovlen = 1;