AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 19:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolv: Remove DEBUG preprocessor conditionals from res_setoptions

Browse Source
This commit is contained in:
Florian Weimer 2017-06-19 13:18:45 +02:00
parent e4e5b57d23
commit e68111fbd6
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2017-06-19 Florian Weimer <fweimer@redhat.com>
* resolv/res_init.c (res_setoptions): Remove DEBUG preprocessor
conditionals.
2017-06-19 Florian Weimer <fweimer@redhat.com>
* resolv/res-close.c: New file.

21
resolv/res_init.c
View File

@ -83,9 +83,6 @@
#include <sys/types.h>
#include <inet/net-internal.h>
/* Options. Should all be left alone. */
/* #undef DEBUG */
static void res_setoptions (res_state, const char *, const char *)
internal_function;
@ -383,11 +380,6 @@ res_setoptions(res_state statp, const char *options, const char *source) {
const char *cp = options;
int i;
#ifdef DEBUG
if (statp->options & RES_DEBUG)
printf(";; res_setoptions(\"%s\", \"%s\")...\n",
options, source);
#endif
while (*cp) {
/* skip leading and inner runs of spaces */
while (*cp == ' ' || *cp == '\t')
@ -399,10 +391,6 @@ res_setoptions(res_state statp, const char *options, const char *source) {
statp->ndots = i;
else
statp->ndots = RES_MAXNDOTS;
#ifdef DEBUG
if (statp->options & RES_DEBUG)
printf(";;\tndots=%d\n", statp->ndots);
#endif
} else if (!strncmp(cp, "timeout:", sizeof("timeout:") - 1)) {
i = atoi(cp + sizeof("timeout:") - 1);
if (i <= RES_MAXRETRANS)
@ -415,15 +403,6 @@ res_setoptions(res_state statp, const char *options, const char *source) {
statp->retry = i;
else
statp->retry = RES_MAXRETRY;
} else if (!strncmp(cp, "debug", sizeof("debug") - 1)) {
#ifdef DEBUG
if (!(statp->options & RES_DEBUG)) {
printf(";; res_setoptions(\"%s\", \"%s\")..\n",
options, source);
statp->options |= RES_DEBUG;
}
printf(";;\tdebug\n");
#endif
} else {
static const struct
{