From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-4.2 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI,NICE_REPLY_A, RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id EF1951F8C6 for ; Thu, 15 Jul 2021 05:10:14 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 272983850413 for ; Thu, 15 Jul 2021 05:10:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 272983850413 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626325814; bh=tX6QJiCTfenC2E4ak1tS0dhyDurajM3/nTXgI1XXjqA=; h=Subject:To:References:Date:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=D9yXnILiyXfdoW0vjW1LV9BQW5vc2mswEs3ah/EJ8b0o9Q03oJNtli5R23xfJg7ht oOfDmuN1N2V1lq3zY4eAcTanq/oME7QjSmDTv0DGP1tY9cyh0KqOlxIRjCug+EjnFU mTUCMLUDKroj1oLSu4M8aO+N0JxGmlznpDDrtxxc= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id CEB99399C02A for ; Thu, 15 Jul 2021 05:01:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CEB99399C02A Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-202-baftYgcsNs-J_l0gryVXNA-1; Thu, 15 Jul 2021 01:01:14 -0400 X-MC-Unique: baftYgcsNs-J_l0gryVXNA-1 Received: by mail-qk1-f198.google.com with SMTP id c3-20020a37b3030000b02903ad0001a2e8so2909790qkf.3 for ; Wed, 14 Jul 2021 22:01:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=tX6QJiCTfenC2E4ak1tS0dhyDurajM3/nTXgI1XXjqA=; b=oj9COLsKDQnQ0jh6GJrpCLrj+Vscnu11D35GE4y3+7XKniwLr3G+N/3t1ugmgduKZi Era6I5nMsyFna7nW8NfhAQ3XHMpWebQYcOlVmykx/wAyCyIhTt5NxotE3cYizjD6lomK W9kTuHYuXLA28e3zPcjWQZBvjY4y5sJ4VpJhsFJJ59sE1+9FPeIAhRSJV8oJ9XHksbXc XT/BKD+G5DIU78/cZ7xk8ywK/5IgVLf0vCJ67lgN9qRZLYW1D6xdZRV7tMRBKYtMvuwd Azd28jzXySt9kPsfoy2TFR+vPtALx2A93VYD1RLcta/HtwO70tsrkdR3hPkgOT/VX17P CYIg== X-Gm-Message-State: AOAM533PMOzPTwFejBmvqPdVCmWfzi7GM5hlqpl84237SneiPIUJX6QM 9lnI2rycwaz4nGaFFpjhOhx8WkUhlbtkiF1MLc1Pp3w3pqBxPOKSpEdBoHue/Wg2iMNP1wRKK+V xyfBQ1WJjXb8F4dJRQOs37at28WBw1MBIpkt5HTon+6hNKYk9l0TIubRT5pIWNfQqaXCTrA== X-Received: by 2002:a05:622a:164d:: with SMTP id y13mr2134368qtj.244.1626325273746; Wed, 14 Jul 2021 22:01:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3dh/qt8q7mPM/EkhAjrIjWhXELtcrIvxxJWgK9lkvrH3Edud9rnvxPGcYcRZ0WTt+cpENog== X-Received: by 2002:a05:622a:164d:: with SMTP id y13mr2134346qtj.244.1626325273536; Wed, 14 Jul 2021 22:01:13 -0700 (PDT) Received: from [192.168.1.16] (198-84-214-74.cpe.teksavvy.com. [198.84.214.74]) by smtp.gmail.com with ESMTPSA id 12sm2015204qkr.10.2021.07.14.22.01.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 14 Jul 2021 22:01:13 -0700 (PDT) Subject: Re: [PATCH 13/30] resolv: Move _getlong, _getshort, __putlong, __putshort to res-putget To: Florian Weimer , libc-alpha@sourceware.org References: Organization: Red Hat Message-ID: Date: Thu, 15 Jul 2021 01:01:12 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Carlos O'Donell via Libc-alpha Reply-To: Carlos O'Donell Errors-To: libc-alpha-bounces+e=80x24.org@sourceware.org Sender: "Libc-alpha" 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 Tested-by: Carlos O'Donell > --- > 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 > + . */ > + > +/* > + * 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 > +#include > + > +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. > -- Cheers, Carlos.