resolv: Remove source argument fron res_options

diff --git a/ChangeLog b/ChangeLog
index 6e8e456b27f47cfb48d33c8e6c8be80be9690637..ec7ce1c0447cb5a3e01c1bf88676e2ce7f959cbd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/resolv/res_init.c b/resolv/res_init.c
index 821f06061b4c3fb171b6df87befe0dabdeeba6f0..5d8b2c994d8e6f0446468857c980f1cf65822342 100644 (file)
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -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;