From patchwork Fri Jun 30 10:38:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 21353 Received: (qmail 63095 invoked by alias); 30 Jun 2017 10:38:57 -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 63025 invoked by uid 89); 30 Jun 2017 10:38:56 -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=California, rights, california, reserved X-HELO: mx1.redhat.com DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 25508612BC Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=fweimer@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 25508612BC Date: Fri, 30 Jun 2017 12:38:52 +0200 To: libc-alpha@sourceware.org Subject: [PATCH COMMITTED] resolv: Remove DEBUG macro from resolv/res_mkquery.c User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20170630103852.42BA2439942F0@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) 2017-06-30 Florian Weimer * resolv/res_mkquery.c (DEBUG): Remove macro and preprocessor conditionals. diff --git a/resolv/res_mkquery.c b/resolv/res_mkquery.c index 8279d15..2e3aa39 100644 --- a/resolv/res_mkquery.c +++ b/resolv/res_mkquery.c @@ -1,3 +1,21 @@ +/* Creation of DNS query packets. + 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) 1985, 1993 * The Regents of the University of California. All rights reserved. @@ -70,13 +88,9 @@ #include #include #include -#include #include #include -/* Options. Leave them on. */ -/* #define DEBUG */ - #include #include #if HP_TIMING_AVAIL @@ -107,11 +121,6 @@ res_nmkquery(res_state statp, || type < 0 || type > 65535) return -1; -#ifdef DEBUG - if (statp->options & RES_DEBUG) - printf(";; res_nmkquery(%s, %s, %s, %s)\n", - _res_opcodes[op], dname, p_class(class), p_type(type)); -#endif /* * Initialize header fields. */ @@ -210,11 +219,6 @@ __res_nopt(res_state statp, { u_int16_t flags = 0; -#ifdef DEBUG - if ((statp->options & RES_DEBUG) != 0U) - printf(";; res_nopt()\n"); -#endif - HEADER *hp = (HEADER *) buf; u_char *cp = buf + n0; u_char *ep = buf + buflen; @@ -253,10 +257,6 @@ __res_nopt(res_state statp, *cp++ = 0; /* EDNS version */ if (statp->options & RES_USE_DNSSEC) { -#ifdef DEBUG - if (statp->options & RES_DEBUG) - printf(";; res_opt()... ENDS0 DNSSEC\n"); -#endif flags |= NS_OPT_DNSSEC_OK; }