From patchwork Mon Jun 19 12:26:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 777717 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wrqwz4d62z9s7f for ; Mon, 19 Jun 2017 22:27:15 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="Ko6rXW8D"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; q=dns; s=default; b= higS6/jUhgaGHQuLB0z/aK2fDKh2BR/OLIjw2qu52k3FSyXoJVGx+Wm1LH9iK89G Iiq/1X7toNUxfTlteACSn/snzk+Jc0BdXmNcbqb3y5T6C+VD+yJqZ6LYH94Qu9mB +1RG/dtvNJVphXz+7R61SuIrupyUYx2G4f2n+FdIXIY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; s=default; bh=ImyRIf VEPp4EiK8xiWhYxTxNMbQ=; b=Ko6rXW8DKTAcYu9qtSWU0WxI6vytywaLGgXTru EUpqniXOCRZaVR+uYifBVI4irRmR88HEXh2NeZqHLp4TkVmlhQGC1iKl0CevqaTC k1n3tRuXKqexYvO2AsEKLUMo9E06fQKoH7fyqmdngs8UmKZ+BwLr4q1+rJ1yVKVQ bdQZY= Received: (qmail 103658 invoked by alias); 19 Jun 2017 12:26:45 -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 103464 invoked by uid 89); 19 Jun 2017 12:26:44 -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, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CCFBB3B703 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 CCFBB3B703 Date: Mon, 19 Jun 2017 14:26:46 +0200 To: libc-alpha@sourceware.org Subject: [PATCH COMMITTED] resolv: Remove DEBUG preprocessor conditionals from res_setoptions User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20170619122646.1A10640138EE9@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) 2017-06-19 Florian Weimer * resolv/res_init.c (res_setoptions): Remove DEBUG preprocessor conditionals. diff --git a/resolv/res_init.c b/resolv/res_init.c index eb380d3..eb24fca 100644 --- a/resolv/res_init.c +++ b/resolv/res_init.c @@ -83,9 +83,6 @@ #include #include -/* Options. Should all be left alone. */ -/* #undef DEBUG */ - static void res_setoptions (res_state, const char *, const char *) internal_function; @@ -383,11 +380,6 @@ res_setoptions(res_state statp, const char *options, const char *source) { const char *cp = options; int i; -#ifdef DEBUG - if (statp->options & RES_DEBUG) - printf(";; res_setoptions(\"%s\", \"%s\")...\n", - options, source); -#endif while (*cp) { /* skip leading and inner runs of spaces */ while (*cp == ' ' || *cp == '\t') @@ -399,10 +391,6 @@ res_setoptions(res_state statp, const char *options, const char *source) { statp->ndots = i; else statp->ndots = RES_MAXNDOTS; -#ifdef DEBUG - if (statp->options & RES_DEBUG) - printf(";;\tndots=%d\n", statp->ndots); -#endif } else if (!strncmp(cp, "timeout:", sizeof("timeout:") - 1)) { i = atoi(cp + sizeof("timeout:") - 1); if (i <= RES_MAXRETRANS) @@ -415,15 +403,6 @@ res_setoptions(res_state statp, const char *options, const char *source) { statp->retry = i; else statp->retry = RES_MAXRETRY; - } else if (!strncmp(cp, "debug", sizeof("debug") - 1)) { -#ifdef DEBUG - if (!(statp->options & RES_DEBUG)) { - printf(";; res_setoptions(\"%s\", \"%s\")..\n", - options, source); - statp->options |= RES_DEBUG; - } - printf(";;\tdebug\n"); -#endif } else { static const struct {