From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 5BB34393F823; Mon, 19 Jul 2021 08:32:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5BB34393F823 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc] resolv: Move res_hostalias into its own file, along with hostalias X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/master X-Git-Oldrev: be5773e1668ab62e980b58c68c3ffd0fd65e31af X-Git-Newrev: 66ac4268f48e4dbcb09b2b6128efa84a6564c1e6 Message-Id: <20210719083213.5BB34393F823@sourceware.org> Date: Mon, 19 Jul 2021 08:32:13 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jul 2021 08:32:13 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=66ac4268f48e4dbcb09b2b6128efa84a6564c1e6 commit 66ac4268f48e4dbcb09b2b6128efa84a6564c1e6 Author: Florian Weimer Date: Mon Jul 19 07:55:27 2021 +0200 resolv: Move res_hostalias into its own file, along with hostalias These deprecated symbols continue to be exported from libresolv. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell Diff: --- resolv/Makefile | 1 + resolv/res_hostalias.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ resolv/res_query.c | 30 ----------------------------- 3 files changed, 52 insertions(+), 30 deletions(-) diff --git a/resolv/Makefile b/resolv/Makefile index bfcca70f26..8c28afe5c4 100644 --- a/resolv/Makefile +++ b/resolv/Makefile @@ -152,6 +152,7 @@ libresolv-routines := \ res_data \ res_debug \ res_enable_icmp \ + res_hostalias \ res_isourserver \ res_mkquery \ res_query \ diff --git a/resolv/res_hostalias.c b/resolv/res_hostalias.c new file mode 100644 index 0000000000..d364725677 --- /dev/null +++ b/resolv/res_hostalias.c @@ -0,0 +1,51 @@ +/* HOSTALIASES-based name resolution. Public legacy functions. + Copyright (C) 2017-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include + +/* Common part of res_hostalias and hostalias. */ +static const char * +context_hostalias_common (struct resolv_context *ctx, + const char *name, char *dst, size_t siz) +{ + if (ctx == NULL) + { + RES_SET_H_ERRNO (&_res, NETDB_INTERNAL); + return NULL; + } + const char *result = __res_context_hostalias (ctx, name, dst, siz); + __resolv_context_put (ctx); + return result; +} + +const char * +res_hostalias (res_state statp, const char *name, char *dst, size_t siz) +{ + return context_hostalias_common + (__resolv_context_get_override (statp), name, dst, siz); +} + +const char * +hostalias (const char *name) +{ + static char abuf[MAXDNAME]; + return context_hostalias_common + (__resolv_context_get (), name, abuf, sizeof (abuf)); +} diff --git a/resolv/res_query.c b/resolv/res_query.c index 45c591ae27..2457193d31 100644 --- a/resolv/res_query.c +++ b/resolv/res_query.c @@ -635,36 +635,6 @@ res_querydomain (const char *name, const char *domain, int class, int type, (__resolv_context_get (), name, domain, class, type, answer, anslen); } -/* Common part of res_hostalias and hostalias. */ -static const char * -context_hostalias_common (struct resolv_context *ctx, - const char *name, char *dst, size_t siz) -{ - if (ctx == NULL) - { - RES_SET_H_ERRNO (&_res, NETDB_INTERNAL); - return NULL; - } - const char *result = __res_context_hostalias (ctx, name, dst, siz); - __resolv_context_put (ctx); - return result; -} - -const char * -res_hostalias (res_state statp, const char *name, char *dst, size_t siz) -{ - return context_hostalias_common - (__resolv_context_get_override (statp), name, dst, siz); -} - -const char * -hostalias (const char *name) -{ - static char abuf[MAXDNAME]; - return context_hostalias_common - (__resolv_context_get (), name, abuf, sizeof (abuf)); -} - #if SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2) # undef res_query # undef res_querydomain