From patchwork Fri Jun 30 10:39:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 21360 Received: (qmail 64435 invoked by alias); 30 Jun 2017 10:39:10 -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 64394 invoked by uid 89); 30 Jun 2017 10:39:09 -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 95C48C057FA5 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=fweimer@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 95C48C057FA5 Date: Fri, 30 Jun 2017 12:39:05 +0200 To: libc-alpha@sourceware.org Subject: [PATCH COMMITTED] resolv: Move res_isourserver, res_send from res_data.c to res_send.c User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20170630103905.978B1439942F0@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) 2017-06-30 Florian Weimer * resolv/res_data.c (res_isourserver, res_send): Move to ... * resolv/res_send.c (res_isourserver, res_send): here. diff --git a/resolv/res_data.c b/resolv/res_data.c index d05389e..b790b4b 100644 --- a/resolv/res_data.c +++ b/resolv/res_data.c @@ -45,22 +45,6 @@ res_query(const char *name, /* domain name */ return (res_nquery(&_res, name, class, type, answer, anslen)); } -int -res_isourserver(const struct sockaddr_in *inp) { - return (res_ourserver_p(&_res, (const struct sockaddr_in6 *) inp)); -} - -int -res_send(const u_char *buf, int buflen, u_char *ans, int anssiz) { - if (__res_maybe_init (&_res, 1) == -1) { - /* errno should have been set by res_init() in this case. */ - return (-1); - } - - return (res_nsend(&_res, buf, buflen, ans, anssiz)); -} - - void res_close(void) { /* diff --git a/resolv/res_send.c b/resolv/res_send.c index 01b9b0e..a7daae8 100644 --- a/resolv/res_send.c +++ b/resolv/res_send.c @@ -243,6 +243,12 @@ res_ourserver_p(const res_state statp, const struct sockaddr_in6 *inp) return (0); } +int +res_isourserver (const struct sockaddr_in *inp) +{ + return res_ourserver_p (&_res, (const struct sockaddr_in6 *) inp); +} + /* int * res_nameinquery(name, type, class, buf, eom) * look for (name,type,class) in the query section of packet (buf,eom) @@ -544,6 +550,15 @@ res_nsend(res_state statp, } libresolv_hidden_def (res_nsend) +int +res_send (const unsigned char *buf, int buflen, unsigned char *ans, int anssiz) +{ + if (__res_maybe_init (&_res, 1) == -1) + /* errno should have been set by res_init in this case. */ + return -1; + return res_nsend (&_res, buf, buflen, ans, anssiz); +} + /* Private */ static struct sockaddr *