From patchwork Fri Jun 30 10:39:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 21364 Received: (qmail 67995 invoked by alias); 30 Jun 2017 10:39:55 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 65045 invoked by uid 89); 30 Jun 2017 10:39:16 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8D00080473 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=fweimer@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 8D00080473 Date: Fri, 30 Jun 2017 12:39:12 +0200 To: libc-alpha@sourceware.org Subject: [PATCH COMMITTED] resolv: Remove source argument fron res_options User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20170630103912.A3AF0439942F0@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) 2017-06-30 Florian Weimer * resolv/res_init.c (res_setoptions): Remove source argument. (res_vinit_1): Adjust. diff --git a/resolv/res_init.c b/resolv/res_init.c index 821f060..5d8b2c9 100644 --- a/resolv/res_init.c +++ b/resolv/res_init.c @@ -103,7 +103,7 @@ #include #include -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;