From patchwork Fri Jun 30 10:38:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 21355 Received: (qmail 63550 invoked by alias); 30 Jun 2017 10:39:02 -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 63480 invoked by uid 89); 30 Jun 2017 10:39:01 -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 9306461D22 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=fweimer@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 9306461D22 Date: Fri, 30 Jun 2017 12:38:56 +0200 To: libc-alpha@sourceware.org Subject: [PATCH COMMITTED] resolv: Move the res_mkquery function to the resolv/mk_query.c file User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20170630103856.B1579439942F0@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) 2017-06-30 Florian Weimer * resolv/res_data.c (res_mkquery): Move ... * resolv/res_mkquery.c (res_mkquery): to here. diff --git a/resolv/res_data.c b/resolv/res_data.c index 569ff4c..d907bfc 100644 --- a/resolv/res_data.c +++ b/resolv/res_data.c @@ -73,25 +73,6 @@ fp_nquery(const u_char *msg, int len, FILE *file) { libresolv_hidden_def (fp_nquery) int -res_mkquery(int op, /* opcode of query */ - const char *dname, /* domain name */ - int class, int type, /* class and type of query */ - const u_char *data, /* resource record data */ - int datalen, /* length of data */ - const u_char *newrr_in, /* new rr for modify or append */ - u_char *buf, /* buffer to put query */ - int buflen) /* size of buffer */ -{ - if (__res_maybe_init (&_res, 1) == -1) { - RES_SET_H_ERRNO(&_res, NETDB_INTERNAL); - return (-1); - } - return (res_nmkquery(&_res, op, dname, class, type, - data, datalen, - newrr_in, buf, buflen)); -} - -int res_query(const char *name, /* domain name */ int class, int type, /* class and type of query */ u_char *answer, /* buffer to put answer */ @@ -180,11 +161,9 @@ libresolv_hidden_def (hostalias) #include #if SHLIB_COMPAT(libresolv, GLIBC_2_0, GLIBC_2_2) -# undef res_mkquery # undef res_query # undef res_querydomain # undef res_search -weak_alias (__res_mkquery, res_mkquery); weak_alias (__res_query, res_query); weak_alias (__res_querydomain, res_querydomain); weak_alias (__res_search, res_search); diff --git a/resolv/res_mkquery.c b/resolv/res_mkquery.c index a601b69..9afb410 100644 --- a/resolv/res_mkquery.c +++ b/resolv/res_mkquery.c @@ -90,6 +90,7 @@ #include #include #include +#include #include #include @@ -202,6 +203,21 @@ res_nmkquery (res_state statp, int op, const char *dname, } libresolv_hidden_def (res_nmkquery) +int +res_mkquery (int op, const char *dname, int class, int type, + const unsigned char *data, int datalen, + const unsigned char *newrr_in, + unsigned char *buf, int buflen) +{ + if (__res_maybe_init (&_res, 1) == -1) + { + RES_SET_H_ERRNO (&_res, NETDB_INTERNAL); + return -1; + } + return res_nmkquery (&_res, op, dname, class, type, + data, datalen, newrr_in, buf, buflen); +} + /* Create an OPT resource record. Return the length of the final packet, or -1 on error. @@ -262,3 +278,8 @@ __res_nopt (res_state statp, int n0, unsigned char *buf, int buflen, return cp - buf; } + +#if SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2) +# undef res_mkquery +weak_alias (__res_mkquery, res_mkquery); +#endif