Clean up: The local variable name "socket" is overloaded, so rename it.
Signed-off-by: Chuck Lever <[EMAIL PROTECTED]> --- utils/mount/network.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/utils/mount/network.c b/utils/mount/network.c index 9f8d1d4..5e6d17d 100644 --- a/utils/mount/network.c +++ b/utils/mount/network.c @@ -875,18 +875,18 @@ int clnt_ping(struct sockaddr_in *saddr, const unsigned long prog, int get_client_address(struct sockaddr_in *saddr, struct sockaddr_in *caddr) { socklen_t len = sizeof(*caddr); - int socket, err; + int sock, err; - socket = nfs_getsocket((struct sockaddr *)saddr, IPPROTO_UDP, + sock = nfs_getsocket((struct sockaddr *)saddr, IPPROTO_UDP, CONNECT_TIMEOUT, FALSE, TRUE); - if (socket == RPC_ANYSOCK) + if (sock == RPC_ANYSOCK) return 0; - err = getsockname(socket, caddr, &len); + err = getsockname(sock, caddr, &len); if (err && verbose) nfs_error(_("%s: error acquiring client's local address: %s"), progname, strerror(errno)); - close(socket); + close(sock); return err ? 0 : 1; } - To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html