diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | resolv/res_init.c | 15 |
2 files changed, 16 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 0e2f1417ef..da00dbd5b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 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 conditionals. diff --git a/resolv/res_init.c b/resolv/res_init.c index eb24fca3a6..eb8e308fda 100644 --- a/resolv/res_init.c +++ b/resolv/res_init.c @@ -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 != ';' && |