mirror of
https://git.rtems.org/rtems-libbsd/
synced 2025-10-15 17:46:35 +08:00
Update to FreeBSD head 2016-08-23
Git mirror commit 9fe7c416e6abb28b1398fd3e5687099846800cfd.
This commit is contained in:
@@ -58,7 +58,6 @@ static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vi
|
||||
#include <sys/cdefs.h>
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <rtems/bsd/sys/param.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
@@ -90,7 +89,7 @@ static void addrsort(char **, int, res_state);
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG
|
||||
static void dprintf(char *, int, res_state) __printflike(1, 0);
|
||||
static void dbg_printf(char *, int, res_state) __printflike(1, 0);
|
||||
#endif
|
||||
|
||||
#define MAXPACKET (64*1024)
|
||||
@@ -109,10 +108,7 @@ int _dns_ttl_;
|
||||
|
||||
#ifdef DEBUG
|
||||
static void
|
||||
dprintf(msg, num, res)
|
||||
char *msg;
|
||||
int num;
|
||||
res_state res;
|
||||
dbg_printf(char *msg, int num, res_state res)
|
||||
{
|
||||
if (res->options & RES_DEBUG) {
|
||||
int save = errno;
|
||||
@@ -122,7 +118,7 @@ dprintf(msg, num, res)
|
||||
}
|
||||
}
|
||||
#else
|
||||
# define dprintf(msg, num, res) /*nada*/
|
||||
# define dbg_printf(msg, num, res) /*nada*/
|
||||
#endif
|
||||
|
||||
#define BOUNDED_INCR(x) \
|
||||
@@ -375,13 +371,13 @@ gethostanswer(const querybuf *answer, int anslen, const char *qname, int qtype,
|
||||
bp += sizeof(align) - ((u_long)bp % sizeof(align));
|
||||
|
||||
if (bp + n >= ep) {
|
||||
dprintf("size (%d) too big\n", n, statp);
|
||||
dbg_printf("size (%d) too big\n", n, statp);
|
||||
had_error++;
|
||||
continue;
|
||||
}
|
||||
if (hap >= &hed->h_addr_ptrs[_MAXADDRS-1]) {
|
||||
if (!toobig++)
|
||||
dprintf("Too many addresses (%d)\n",
|
||||
dbg_printf("Too many addresses (%d)\n",
|
||||
_MAXADDRS, statp);
|
||||
cp += n;
|
||||
continue;
|
||||
@@ -395,7 +391,7 @@ gethostanswer(const querybuf *answer, int anslen, const char *qname, int qtype,
|
||||
}
|
||||
break;
|
||||
default:
|
||||
dprintf("Impossible condition (type=%d)\n", type,
|
||||
dbg_printf("Impossible condition (type=%d)\n", type,
|
||||
statp);
|
||||
RES_SET_H_ERRNO(statp, NO_RECOVERY);
|
||||
return (-1);
|
||||
@@ -522,12 +518,12 @@ _dns_gethostbyname(void *rval, void *cb_data, va_list ap)
|
||||
n = res_nsearch(statp, name, C_IN, type, buf->buf, sizeof(buf->buf));
|
||||
if (n < 0) {
|
||||
free(buf);
|
||||
dprintf("res_nsearch failed (%d)\n", n, statp);
|
||||
dbg_printf("res_nsearch failed (%d)\n", n, statp);
|
||||
*h_errnop = statp->res_h_errno;
|
||||
return (NS_NOTFOUND);
|
||||
} else if (n > sizeof(buf->buf)) {
|
||||
free(buf);
|
||||
dprintf("static buffer is too small (%d)\n", n, statp);
|
||||
dbg_printf("static buffer is too small (%d)\n", n, statp);
|
||||
*h_errnop = statp->res_h_errno;
|
||||
return (NS_UNAVAIL);
|
||||
}
|
||||
@@ -629,13 +625,13 @@ _dns_gethostbyaddr(void *rval, void *cb_data, va_list ap)
|
||||
sizeof buf->buf);
|
||||
if (n < 0) {
|
||||
free(buf);
|
||||
dprintf("res_nquery failed (%d)\n", n, statp);
|
||||
dbg_printf("res_nquery failed (%d)\n", n, statp);
|
||||
*h_errnop = statp->res_h_errno;
|
||||
return (NS_UNAVAIL);
|
||||
}
|
||||
if (n > sizeof buf->buf) {
|
||||
free(buf);
|
||||
dprintf("static buffer is too small (%d)\n", n, statp);
|
||||
dbg_printf("static buffer is too small (%d)\n", n, statp);
|
||||
*h_errnop = statp->res_h_errno;
|
||||
return (NS_UNAVAIL);
|
||||
}
|
||||
@@ -771,7 +767,7 @@ _sethostdnsent(int stayopen)
|
||||
}
|
||||
|
||||
void
|
||||
_endhostdnsent()
|
||||
_endhostdnsent(void)
|
||||
{
|
||||
res_state statp;
|
||||
|
||||
|
Reference in New Issue
Block a user