Mercurial > hg > octave-nkf > gnulib-hg
changeset 14626:0f3fba4a62b1
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>
| author | Eric Blake <eblake@redhat.com> |
|---|---|
| date | Wed, 27 Apr 2011 09:52:00 -0600 |
| parents | 1a2352cb014f |
| children | 780006cfcb42 |
| files | ChangeLog lib/passfd.c |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 @@ /* 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 @@ 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 @@ /* 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;