[13/30] resolv: Move _getlong, _getshort, __putlong, __putshort to res-putget

  And reformat to GNU style.
---
 resolv/Makefile     |   1 +
 resolv/res-putget.c | 112 ++++++++++++++++++++++++++++++++++++++++++++
 resolv/res_comp.c   |  15 ------
 3 files changed, 113 insertions(+), 15 deletions(-)
 create mode 100644 resolv/res-putget.c
  

On 7/8/21 11:02 AM, Florian Weimer via Libc-alpha wrote:
> And reformat to GNU style.

OK for glibc 2.34.

Tested without regression on x86_64 and i686.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>

> ---
>  resolv/Makefile     |   1 +
>  resolv/res-putget.c | 112 ++++++++++++++++++++++++++++++++++++++++++++
>  resolv/res_comp.c   |  15 ------
>  3 files changed, 113 insertions(+), 15 deletions(-)
>  create mode 100644 resolv/res-putget.c
> 
> diff --git a/resolv/Makefile b/resolv/Makefile
> index 3e7de81fb5..07cac54d3a 100644
> --- a/resolv/Makefile
> +++ b/resolv/Makefile
> @@ -139,6 +139,7 @@ libresolv-routines := \
>    ns_print \
>    ns_samedomain \
>    ns_ttl \
> +  res-putget \

OK.

>    res_comp \
>    res_data \
>    res_debug \
> diff --git a/resolv/res-putget.c b/resolv/res-putget.c
> new file mode 100644
> index 0000000000..8d6e2aedd5
> --- /dev/null
> +++ b/resolv/res-putget.c
> @@ -0,0 +1,112 @@
> +/* Legacy 16-bit, 32-bit marshal/unmarshal functions.

OK.

> +   Copyright (C) 1995-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
> +   <https://www.gnu.org/licenses/>.  */
> +
> +/*
> + * Copyright (c) 1985, 1993
> + *    The Regents of the University of California.  All rights reserved.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + * 1. Redistributions of source code must retain the above copyright
> + *    notice, this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright
> + *    notice, this list of conditions and the following disclaimer in the
> + *    documentation and/or other materials provided with the distribution.
> + * 4. Neither the name of the University nor the names of its contributors
> + *    may be used to endorse or promote products derived from this software
> + *    without specific prior written permission.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
> + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> + * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
> + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
> + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
> + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
> + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> + * SUCH DAMAGE.
> + */
> +
> +/*
> + * Portions Copyright (c) 1993 by Digital Equipment Corporation.
> + *
> + * Permission to use, copy, modify, and distribute this software for any
> + * purpose with or without fee is hereby granted, provided that the above
> + * copyright notice and this permission notice appear in all copies, and that
> + * the name of Digital Equipment Corporation not be used in advertising or
> + * publicity pertaining to distribution of the document or software without
> + * specific, written prior permission.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
> + * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
> + * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
> + * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
> + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
> + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
> + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
> + * SOFTWARE.
> + */
> +
> +/*
> + * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
> + *
> + * Permission to use, copy, modify, and distribute this software for any
> + * purpose with or without fee is hereby granted, provided that the above
> + * copyright notice and this permission notice appear in all copies.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
> + * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
> + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
> + * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
> + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
> + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
> + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
> + * SOFTWARE.
> + */
> +
> +#include <arpa/nameser.h>
> +#include <resolv.h>
> +
> +void
> +__putlong (uint32_t src, unsigned char *dst)
> +{
> +  ns_put32 (src, dst);

OK.

> +}
> +libresolv_hidden_def (__putlong)
> +
> +void
> +__putshort (uint16_t src, unsigned char *dst)
> +{
> +  ns_put16 (src, dst);

OK.

> +}
> +libresolv_hidden_def (__putshort)
> +
> +uint32_t
> +_getlong (const unsigned char *src)
> +{
> +  return ns_get32 (src);

OK.

> +}
> +
> +uint16_t
> +_getshort (const unsigned char *src)
> +{
> +  return ns_get16 (src);

OK.

> +}
> diff --git a/resolv/res_comp.c b/resolv/res_comp.c
> index 42e73a1f00..80faea7e5e 100644
> --- a/resolv/res_comp.c
> +++ b/resolv/res_comp.c
> @@ -234,18 +234,3 @@ res_dnok (const char *dn)
>    return printable_string (dn) && ns_name_pton (dn, buf, sizeof (buf)) >= 0;
>  }
>  libresolv_hidden_def (res_dnok)
> -
> -/*
> - * This module must export the following externally-visible symbols:
> - *	___putlong
> - *	___putshort
> - *	__getlong
> - *	__getshort
> - * Note that one _ comes from C and the others come from us.
> - */
> -void __putlong(uint32_t src, u_char *dst) { ns_put32(src, dst); }
> -libresolv_hidden_def (__putlong)
> -void __putshort(uint16_t src, u_char *dst) { ns_put16(src, dst); }
> -libresolv_hidden_def (__putshort)
> -uint32_t _getlong(const u_char *src) { return (ns_get32(src)); }
> -uint16_t _getshort(const u_char *src) { return (ns_get16(src)); }

OK.

>