From patchwork Fri Jun 30 10:39:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 21362 Received: (qmail 64906 invoked by alias); 30 Jun 2017 10:39:15 -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 64839 invoked by uid 89); 30 Jun 2017 10:39:14 -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=Hx-languages-length:2514 X-HELO: mx1.redhat.com DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 880E47DCF4 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=fweimer@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 880E47DCF4 Date: Fri, 30 Jun 2017 12:39:08 +0200 To: libc-alpha@sourceware.org Subject: [PATCH COMMITTED] resolv: Reformat resolv/res_data.c to GNU style User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20170630103908.962DD439942F0@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) 2017-06-30 Florian Weimer * resolv/res_data.c: Reformat to GNU style. (res_close): Update comments. diff --git a/resolv/res_data.c b/resolv/res_data.c index 5e7688c..2cafd38 100644 --- a/resolv/res_data.c +++ b/resolv/res_data.c @@ -1,3 +1,21 @@ +/* Miscellaneous definitions for libresolv. + Copyright (C) 1995-2017 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) 1995-1999 by Internet Software Consortium. * @@ -17,18 +35,20 @@ #include +/* This function belongs to libresolv, which is why it is not included + in res-close.c. */ void -res_close(void) { - /* - * Some stupid programs out there call res_close() before res_init(). - * Since _res._vcsock isn't explicitly initialized, these means that - * we could do a close(0), which might lead to some security problems. - * Therefore we check if res_init() was called before by looking at - * the RES_INIT bit in _res.options. If it hasn't been set we bail out - * early. */ - if ((_res.options & RES_INIT) == 0) - return; - /* We don't free the name server addresses because we never - did it and it would be done implicitly on shutdown. */ - __res_iclose(&_res, false); +__res_close (void) +{ + /* Some programs call res_close before res_init. Since _res._vcsock + isn't explicitly initialized, these means that we could call + close (0), which might lead to some security problems. Therefore + we check if res_init was called before by looking at the RES_INIT + bit in _res.options. If it hasn't been set we bail out + early. */ + if ((_res.options & RES_INIT) == 0) + return; + /* We don't free the name server addresses because we never did it + and it would be done implicitly on shutdown. */ + __res_iclose (&_res, false); }