2323. [port] tru64: namespace clash. [RT #17547]

diff --git a/CHANGES b/CHANGES
index 9dba18d7017b8dd93d38a141964abb5afbe1b933..a8c4a53f6c4187f1968224f7bab12ad2d9f1ec8a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2323.  [port]          tru64: namespace clash. [RT #17547]
+
 2322.  [port]          MacOS: work around the limitation of setrlimit()
                        for RLIMIT_NOFILE. [RT #17526]
 

diff --git a/lib/bind/resolv/res_send.c b/lib/bind/resolv/res_send.c
index 58f280fe38acdff4ac28033b7b1f6af8ff8c478f..f578016183a7e2c39628e334ce5a38b28218f207 100644 (file)
--- a/lib/bind/resolv/res_send.c
+++ b/lib/bind/resolv/res_send.c
@@ -70,7 +70,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_send.c   8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_send.c,v 1.18 2007/12/14 03:52:40 marka Exp $";
+static const char rcsid[] = "$Id: res_send.c,v 1.18.10.1 2008/01/27 02:06:46 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*! \file
@@ -293,7 +293,7 @@ int
 res_nsend(res_state statp,
          const u_char *buf, int buflen, u_char *ans, int anssiz)
 {
-       int gotsomewhere, terrno, try, v_circuit, resplen, ns, n;
+       int gotsomewhere, terrno, tries, v_circuit, resplen, ns, n;
        char abuf[NI_MAXHOST];
 
 #ifdef USE_POLL
@@ -405,7 +405,7 @@ res_nsend(res_state statp,
        /*
         * Send request, RETRY times, or until successful.
         */
-       for (try = 0; try < statp->retry; try++) {
+       for (tries = 0; tries < statp->retry; tries++) {
            for (ns = 0; ns < statp->nscount; ns++) {
                struct sockaddr *nsap;
                int nsaplen;
@@ -453,7 +453,7 @@ res_nsend(res_state statp,
 
                if (v_circuit) {
                        /* Use VC; at most one attempt per server. */
-                       try = statp->retry;
+                       tries = statp->retry;
                        n = send_vc(statp, buf, buflen, ans, anssiz, &terrno,
                                    ns);
                        if (n < 0)
@@ -464,7 +464,7 @@ res_nsend(res_state statp,
                } else {
                        /* Use datagrams. */
                        n = send_dg(statp, buf, buflen, ans, anssiz, &terrno,
-                                   ns, try, &v_circuit, &gotsomewhere);
+                                   ns, tries, &v_circuit, &gotsomewhere);
                        if (n < 0)
                                goto fail;
                        if (n == 0)
@@ -787,7 +787,7 @@ send_vc(res_state statp,
 
 static int
 send_dg(res_state statp, const u_char *buf, int buflen, u_char *ans,
-       int anssiz, int *terrno, int ns, int try, int *v_circuit,
+       int anssiz, int *terrno, int ns, int tries, int *v_circuit,
        int *gotsomewhere)
 {
        const HEADER *hp = (const HEADER *) buf;
@@ -869,7 +869,7 @@ send_dg(res_state statp, const u_char *buf, int buflen, u_char *ans,
        /*
         * Wait for reply.
         */
-       seconds = (statp->retrans << try);
+       seconds = (statp->retrans << tries);
        if (ns > 0)
                seconds /= statp->nscount;
        if (seconds <= 0)

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 1a0ba18b637a54baca505d8678536505da53d8d5..01ef8a5b7780a37cead8fba3dab706ab5da8ef96 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.275.10.2 2008/01/22 23:27:35 tbox Exp $ */
+/* $Id: socket.c,v 1.275.10.3 2008/01/27 02:06:46 marka Exp $ */
 
 /*! \file */
 
@@ -1475,7 +1475,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
 #endif
        char strbuf[ISC_STRERRORSIZE];
        const char *err = "socket";
-       int try = 0;
+       int tries = 0;
 
        REQUIRE(VALID_MANAGER(manager));
        REQUIRE(socketp != NULL && *socketp == NULL);
@@ -1500,7 +1500,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
                INSIST(type != isc_sockettype_fdwatch);
                break;
        }
-       if (sock->fd == -1 && errno == EINTR && try++ < 42)
+       if (sock->fd == -1 && errno == EINTR && tries++ < 42)
                goto again;
 
 #ifdef F_DUPFD