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

resolv: Remove source argument fron res_options

This commit is contained in:
Florian Weimer 2017-06-30 11:32:19 +02:00
parent 3f8f1eb6b0
commit b606c6ce66
2 changed files with 9 additions and 4 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-30 Florian Weimer <fweimer@redhat.com>
* resolv/res_init.c (res_setoptions): Remove source argument.
(res_vinit_1): Adjust.
2017-06-30 Florian Weimer <fweimer@redhat.com>
* resolv/res_query.c (DEBUG): Remove preprocessor conditional.

8
resolv/res_init.c
View File

@ -103,7 +103,7 @@
#include <inet/net-internal.h>
#include <errno.h>
static void res_setoptions (res_state, const char *, const char *);
static void res_setoptions (res_state, const char *);
static uint32_t net_mask (struct in_addr);
unsigned long long int __res_initstamp;
@ -381,7 +381,7 @@ res_vinit_1 (res_state statp, bool preinit, FILE *fp, char **buffer)
}
if (MATCH (*buffer, "options"))
{
res_setoptions (statp, *buffer + sizeof ("options") - 1, "conf");
res_setoptions (statp, *buffer + sizeof ("options") - 1);
continue;
}
}
@ -417,7 +417,7 @@ res_vinit_1 (res_state statp, bool preinit, FILE *fp, char **buffer)
}
if ((cp = getenv ("RES_OPTIONS")) != NULL)
res_setoptions (statp, cp, "env");
res_setoptions (statp, cp);
statp->options |= RES_INIT;
return true;
}
@ -469,7 +469,7 @@ __res_vinit (res_state statp, int preinit)
}
static void
res_setoptions (res_state statp, const char *options, const char *source)
res_setoptions (res_state statp, const char *options)
{
const char *cp = options;