Commit 7539c231 authored by Mark Andrews's avatar Mark Andrews
Browse files

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

parent 29d01916
2323. [port] tru64: namespace clash. [RT #17547]
2322. [port] MacOS: work around the limitation of setrlimit() 2322. [port] MacOS: work around the limitation of setrlimit()
for RLIMIT_NOFILE. [RT #17526] for RLIMIT_NOFILE. [RT #17526]
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
static const char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93"; 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.19 2008/01/27 01:58:19 marka Exp $";
#endif /* LIBC_SCCS and not lint */ #endif /* LIBC_SCCS and not lint */
/*! \file /*! \file
...@@ -293,7 +293,7 @@ int ...@@ -293,7 +293,7 @@ int
res_nsend(res_state statp, res_nsend(res_state statp,
const u_char *buf, int buflen, u_char *ans, int anssiz) 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]; char abuf[NI_MAXHOST];
#ifdef USE_POLL #ifdef USE_POLL
...@@ -405,7 +405,7 @@ res_nsend(res_state statp, ...@@ -405,7 +405,7 @@ res_nsend(res_state statp,
/* /*
* Send request, RETRY times, or until successful. * 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++) { for (ns = 0; ns < statp->nscount; ns++) {
struct sockaddr *nsap; struct sockaddr *nsap;
int nsaplen; int nsaplen;
...@@ -453,7 +453,7 @@ res_nsend(res_state statp, ...@@ -453,7 +453,7 @@ res_nsend(res_state statp,
if (v_circuit) { if (v_circuit) {
/* Use VC; at most one attempt per server. */ /* Use VC; at most one attempt per server. */
try = statp->retry; tries = statp->retry;
n = send_vc(statp, buf, buflen, ans, anssiz, &terrno, n = send_vc(statp, buf, buflen, ans, anssiz, &terrno,
ns); ns);
if (n < 0) if (n < 0)
...@@ -464,7 +464,7 @@ res_nsend(res_state statp, ...@@ -464,7 +464,7 @@ res_nsend(res_state statp,
} else { } else {
/* Use datagrams. */ /* Use datagrams. */
n = send_dg(statp, buf, buflen, ans, anssiz, &terrno, n = send_dg(statp, buf, buflen, ans, anssiz, &terrno,
ns, try, &v_circuit, &gotsomewhere); ns, tries, &v_circuit, &gotsomewhere);
if (n < 0) if (n < 0)
goto fail; goto fail;
if (n == 0) if (n == 0)
...@@ -787,7 +787,7 @@ send_vc(res_state statp, ...@@ -787,7 +787,7 @@ send_vc(res_state statp,
static int static int
send_dg(res_state statp, const u_char *buf, int buflen, u_char *ans, 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) int *gotsomewhere)
{ {
const HEADER *hp = (const HEADER *) buf; const HEADER *hp = (const HEADER *) buf;
...@@ -869,7 +869,7 @@ send_dg(res_state statp, const u_char *buf, int buflen, u_char *ans, ...@@ -869,7 +869,7 @@ send_dg(res_state statp, const u_char *buf, int buflen, u_char *ans,
/* /*
* Wait for reply. * Wait for reply.
*/ */
seconds = (statp->retrans << try); seconds = (statp->retrans << tries);
if (ns > 0) if (ns > 0)
seconds /= statp->nscount; seconds /= statp->nscount;
if (seconds <= 0) if (seconds <= 0)
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: socket.c,v 1.278 2008/01/22 01:06:33 marka Exp $ */ /* $Id: socket.c,v 1.279 2008/01/27 01:58:19 marka Exp $ */
/*! \file */ /*! \file */
...@@ -1475,7 +1475,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type, ...@@ -1475,7 +1475,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
#endif #endif
char strbuf[ISC_STRERRORSIZE]; char strbuf[ISC_STRERRORSIZE];
const char *err = "socket"; const char *err = "socket";
int try = 0; int tries = 0;
REQUIRE(VALID_MANAGER(manager)); REQUIRE(VALID_MANAGER(manager));
REQUIRE(socketp != NULL && *socketp == NULL); REQUIRE(socketp != NULL && *socketp == NULL);
...@@ -1500,7 +1500,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type, ...@@ -1500,7 +1500,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
INSIST(type != isc_sockettype_fdwatch); INSIST(type != isc_sockettype_fdwatch);
break; break;
} }
if (sock->fd == -1 && errno == EINTR && try++ < 42) if (sock->fd == -1 && errno == EINTR && tries++ < 42)
goto again; goto again;
#ifdef F_DUPFD #ifdef F_DUPFD
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment