authd/res: make function used only within this unit static, remove unused macros

This commit is contained in:
Aaron Jones 2016-06-01 20:32:12 +00:00
parent 656c85d090
commit 856440bcb3
No known key found for this signature in database
GPG key ID: 6E854C0FAAD4CEA4

View file

@ -44,8 +44,6 @@
static PF res_readreply; static PF res_readreply;
#define MAXPACKET 1024 /* rfc sez 512 but we expand names so ... */ #define MAXPACKET 1024 /* rfc sez 512 but we expand names so ... */
#define RES_MAXALIASES 35 /* maximum aliases allowed */
#define RES_MAXADDRS 35 /* maximum addresses allowed */
#define AR_TTL 600 /* TTL in seconds for dns cache entries */ #define AR_TTL 600 /* TTL in seconds for dns cache entries */
/* RFC 1104/1105 wasn't very helpful about what these fields /* RFC 1104/1105 wasn't very helpful about what these fields
@ -100,12 +98,6 @@ static struct reslist *find_id(int id);
static struct DNSReply *make_dnsreply(struct reslist *request); static struct DNSReply *make_dnsreply(struct reslist *request);
static uint16_t generate_random_id(void); static uint16_t generate_random_id(void);
#ifdef RES_MIN
#undef RES_MIN
#endif
#define RES_MIN(a, b) ((a) < (b) ? (a) : (b))
/* /*
* int * int
* res_ourserver(inp) * res_ourserver(inp)
@ -261,7 +253,7 @@ void restart_resolver(void)
* add_local_domain - Add the domain to hostname, if it is missing * add_local_domain - Add the domain to hostname, if it is missing
* (as suggested by eps@TOASTER.SFSU.EDU) * (as suggested by eps@TOASTER.SFSU.EDU)
*/ */
void add_local_domain(char *hname, size_t size) static void add_local_domain(char *hname, size_t size)
{ {
/* try to fix up unqualified names */ /* try to fix up unqualified names */
if (strchr(hname, '.') == NULL) if (strchr(hname, '.') == NULL)
@ -695,7 +687,6 @@ static int proc_answer(struct reslist *request, HEADER * header, char *buf, char
v4->sin_family = AF_INET; v4->sin_family = AF_INET;
memcpy(&v4->sin_addr, current, sizeof(struct in_addr)); memcpy(&v4->sin_addr, current, sizeof(struct in_addr));
return (1); return (1);
break;
#ifdef RB_IPV6 #ifdef RB_IPV6
case T_AAAA: case T_AAAA:
if (request->type != T_AAAA) if (request->type != T_AAAA)
@ -707,7 +698,6 @@ static int proc_answer(struct reslist *request, HEADER * header, char *buf, char
v6->sin6_family = AF_INET6; v6->sin6_family = AF_INET6;
memcpy(&v6->sin6_addr, current, sizeof(struct in6_addr)); memcpy(&v6->sin6_addr, current, sizeof(struct in6_addr));
return (1); return (1);
break;
#endif #endif
case T_PTR: case T_PTR:
if (request->type != T_PTR) if (request->type != T_PTR)
@ -722,7 +712,6 @@ static int proc_answer(struct reslist *request, HEADER * header, char *buf, char
rb_strlcpy(request->name, hostbuf, IRCD_RES_HOSTLEN + 1); rb_strlcpy(request->name, hostbuf, IRCD_RES_HOSTLEN + 1);
return (1); return (1);
break;
case T_CNAME: case T_CNAME:
/* real answer will follow */ /* real answer will follow */
current += rd_length; current += rd_length;