OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolv: Introduce is_sort_mask and call it from res_vinit

This commit is contained in:
Florian Weimer 2017-06-19 13:19:00 +02:00
parent e68111fbd6
commit 94f094f22b
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2017-06-19 Florian Weimer <fweimer@redhat.com>
* resolv/res_init.c (sort_mask_chars, ISSORTMASK): Remove.
(is_sort_mask): New function.
(__res_vinit): Use it.
2017-06-19 Florian Weimer <fweimer@redhat.com>
* resolv/res_init.c (res_setoptions): Remove DEBUG preprocessor

15
resolv/res_init.c
View File

@ -85,9 +85,6 @@
static void res_setoptions (res_state, const char *, const char *)
internal_function;
static const char sort_mask_chars[] = "/&";
#define ISSORTMASK(ch) (strchr(sort_mask_chars, ch) != NULL)
static u_int32_t net_mask (struct in_addr) __THROW;
unsigned long long int __res_initstamp attribute_hidden;
@ -109,6 +106,14 @@ res_ninit(res_state statp) {
}
libc_hidden_def (__res_ninit)
/* Return true if CH separates the netmask in the "sortlist"
directive. */
static inline bool
is_sort_mask (char ch)
{
return ch == '/' || ch == '&';
}
/* This function has to be reachable by res_data.c but not publically. */
int
__res_vinit(res_state statp, int preinit) {
@ -305,14 +310,14 @@ __res_vinit(res_state statp, int preinit) {
if (*cp == '\0' || *cp == '\n' || *cp == ';')
break;
net = cp;
while (*cp && !ISSORTMASK(*cp) && *cp != ';' &&
while (*cp && !is_sort_mask (*cp) && *cp != ';' &&
isascii(*cp) && !isspace(*cp))
cp++;
n = *cp;
*cp = 0;
if (__inet_aton(net, &a)) {
statp->sort_list[nsort].addr = a;
if (ISSORTMASK(n)) {
if (is_sort_mask (n)) {
*cp++ = n;
net = cp;
while (*cp && *cp != ';' &&