From: Yang Tse <yangsita@gmail.com>
Date: Thu, 18 Oct 2007 17:17:18 +0000 (+0000)
Subject: Renamed internal function to avoid a variable shadowing it
X-Git-Tag: curl-7_17_1~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f0bef2fa04bff0ebfedb090a8cc5566a32f1c44;p=thirdparty%2Fcurl.git

Renamed internal function to avoid a variable shadowing it
---

diff --git a/ares/ares_process.c b/ares/ares_process.c
index a6820de6e5..d977d0937f 100644
--- a/ares/ares_process.c
+++ b/ares/ares_process.c
@@ -725,10 +725,10 @@ void ares__send_query(ares_channel channel, struct query *query, time_t now)
 }
 
 /*
- * nonblock() set the given socket to either blocking or non-blocking mode
+ * setsocknonblock sets the given socket to either blocking or non-blocking mode
  * based on the 'nonblock' boolean argument. This function is highly portable.
  */
-static int nonblock(ares_socket_t sockfd,    /* operate on this */
+static int setsocknonblock(ares_socket_t sockfd,    /* operate on this */
                     int nonblock   /* TRUE or FALSE */)
 {
 #undef SETBLOCK
@@ -798,7 +798,7 @@ static int nonblock(ares_socket_t sockfd,    /* operate on this */
 
 static int configure_socket(int s, ares_channel channel)
 {
-  nonblock(s, TRUE);
+  setsocknonblock(s, TRUE);
 
 #if defined(FD_CLOEXEC) && !defined(MSDOS)
   /* Configure the socket fd as close-on-exec. */