From nobody Fri Dec 10 10:43:28 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 817F218D8C24; Fri, 10 Dec 2021 10:43:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J9SDc1Y3qz3GD8; Fri, 10 Dec 2021 10:43:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 157DE190EE; Fri, 10 Dec 2021 10:43:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BAAhS7r019036; Fri, 10 Dec 2021 10:43:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BAAhS2A019035; Fri, 10 Dec 2021 10:43:28 GMT (envelope-from git) Date: Fri, 10 Dec 2021 10:43:28 GMT Message-Id: <202112101043.1BAAhS2A019035@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 61deed379fc5 - stable/13 - tcpdrop: use a better name of a variable. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 61deed379fc5c09985bb1da7afebbcf233f6413e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639133008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xiHouHOmtf4Ec8msnt83S7/vBg0ejLv5brxDAfDg4Cs=; b=kppgUwnJLqLZKobGq6EpaLkberLw7wj/lbfHJveYEKflwjxtZSnECnzjI2XpwhJegouAEW CoZG9ylJlq+xFsoHttCMuQ2R4HpDy8nmJZ7SQLau/zRGeIweEbF9dJbQOq5J2RtnNAWeUI HwpZ0xY6wm43zxARBvCd7K5E0mdDP7I6lBB4gIRf3CmIoreltSBwS/a/AKy3UxWbg59r8i 3uxdvOD+rebLNexGMo7YfH/MriGDElcR4Cw2NPXQSBURac3s0a+YiqfIcvn3LhXVGTNSHr 83cd5pbyhU0SjHZxMQ8HJ1og8vKiK+k0FG3BvIPiMWYWxNvHwjtxrY5/KHcrDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639133008; a=rsa-sha256; cv=none; b=wG8Zu+LDc41gLFQiF0EcgY2JOdo253mia1srLIJQRY1Me7gkHWGpdFLr6RywlmkvoO3Yk8 rikNHzljm22KImsK3BQSojoO4DGsevU/tzBU3kl2QZqKViZeu+sfWIitcd0q1l3Yp2KYiW gGnj/c2zz9u/UWlnWLKGluxZYbL6FE1ezldzNk2MeCidOL6On7zpCDbUY4OiesO9XSEHIA //uj9sXe+Z9euWpTotIHlmY5GHMhLruzbSQolctO1mfG+wCU2mzzrghHP+nLHoUuKcE4WD ZiXKQdhrf7wohs46O8z2tPwujJx60eJggyp/zGmkXox8Jh0kZ2wYSSnRcY8ioA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=61deed379fc5c09985bb1da7afebbcf233f6413e commit 61deed379fc5c09985bb1da7afebbcf233f6413e Author: Michael Tuexen AuthorDate: 2021-12-04 12:46:43 +0000 Commit: Michael Tuexen CommitDate: 2021-12-10 10:42:34 +0000 tcpdrop: use a better name of a variable. No functional change intended. Sponsored by: Netflix, Inc. (cherry picked from commit 300914a0ffb8b18ace16e6d40fc41270e6039b2e) --- usr.sbin/tcpdrop/tcpdrop.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.sbin/tcpdrop/tcpdrop.c b/usr.sbin/tcpdrop/tcpdrop.c index 1c854c0b29e8..f05c027362b8 100644 --- a/usr.sbin/tcpdrop/tcpdrop.c +++ b/usr.sbin/tcpdrop/tcpdrop.c @@ -68,11 +68,11 @@ main(int argc, char *argv[]) { char stack[TCP_FUNCTION_NAME_LEN_MAX]; char *lport, *fport; - bool dropall, dropallstack; + bool dropall, dropspecific; int ch, state; dropall = false; - dropallstack = false; + dropspecific = false; stack[0] = '\0'; state = -1; @@ -85,11 +85,11 @@ main(int argc, char *argv[]) tcpdrop_list_commands = true; break; case 'S': - dropallstack = true; + dropspecific = true; strlcpy(stack, optarg, sizeof(stack)); break; case 's': - dropallstack = true; + dropspecific = true; for (state = 0; state < TCP_NSTATES; state++) { if (strcmp(tcpstates[state], optarg) == 0) break; @@ -106,9 +106,9 @@ main(int argc, char *argv[]) state == TCPS_CLOSED || state == TCPS_LISTEN) usage(); - if (dropall && dropallstack) + if (dropall && dropspecific) usage(); - if (dropall || dropallstack) { + if (dropall || dropspecific) { if (argc != 0) usage(); if (!tcpdropall(stack, state))