From nobody Tue Feb 04 19:12:31 2025 X-Original-To: dev-commits-src-main@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 4YnY0J3lp1z5mJPl; Tue, 04 Feb 2025 19:12:32 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YnY0H4T1Pz41wQ; Tue, 04 Feb 2025 19:12:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738696351; 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=fRd4l6w86x805oRetlK0+SRESMUBwFXuXDVLfG+ECFk=; b=j6VkPfAYJxq0StzJw9QohLTkLTYmWviVD9LcyM84XHdEJ71egOAn7dxe0TzVNifPrS+2TE 2kSfEJCVhmkX+mjs0LptN6i6u/pJouaWXVjINZEo3EIby2jujzSMYBu+9PHXHk72F4bc0C Y07WvTWHV6Qv+KwbdQz4/ZTokr5+ryvmrQe0OBVVR6mDWX5Lg+b8D04JPnriKvfO9S8Xst AR2wO6/lHhlSI080qnLKlNFkP6pmkhSR45n1XpdgWQC7g4vjEWDIHk7BOfTbzf4/Xswjjz xKuDtSqSJ/T+Kjd1B+kbi6tKW75xizUwhMaa+RobXscTWGozHmAdUsp6BiYcyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738696351; 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=fRd4l6w86x805oRetlK0+SRESMUBwFXuXDVLfG+ECFk=; b=XX1AO9bLewuX4L1qibJt3PSPtPMKF66oknbHUXQSqdVOSbqr2L+6CKOIgE7cEMlNDWRMyE BCDNDlauw4jxfgz48bJi2jpZTuaXUUDVuLRngPOKp8kaw7WVYHjiyBgaT01YQK87G+XioP mcCAjkjW/XAuKlIcVlvfy7OU5L5b+hdBRUPBlUNA+KV+lxQ5dHtFZ16aWQZk6hnlAsyMTU CFXHz9TbSyFigBysMiaQF4qDB/mmcMunk13g/BnP1aT6oKODTrzZPpd+CPBhM/zpPKhseb wQuRw4JYGZQkm1KJFl7q5cxYRiUHM9EDzOjXmHZF9cPrnFy+gYxmIj1nKk1n3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738696351; a=rsa-sha256; cv=none; b=aE6lqhDVuPvkw95Bhp6I5yhWkTqrZ9hCVMikARLtbIo6+qSdoh94gadERBP3TMhNthSHRP q5F1O92F9KMsp3O/nz+l5Sg7cuFX+jha1GvDLEKUPPnT4oGArFSWj/+6WL66TadJxGIKtv yZ/W2pNMNUotxrwssKpMse7OQzHGmKy24d6r3exx372rWvRK0jljXmuqGEmlXXFfsa6wdf Np7yXDleqpuA4RY+YDLqFEdEO8SOoc2x2A61j6BJf7TgcgPrWKLlR4ZdX6kRdMuTRolJyX YO8GIe3O1Ds4KjlhjPtKzSw6iZWFtjBDjD4zQU39YJET1zknttfae7doiPN28Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YnY0H43T0z4Bs; Tue, 04 Feb 2025 19:12:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 514JCVwh011284; Tue, 4 Feb 2025 19:12:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 514JCVes011281; Tue, 4 Feb 2025 19:12:31 GMT (envelope-from git) Date: Tue, 4 Feb 2025 19:12:31 GMT Message-Id: <202502041912.514JCVes011281@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: c032fb855766 - main - netstat: Use bool more widely List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c032fb855766d25d91b190af554e1ba86bbe7856 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c032fb855766d25d91b190af554e1ba86bbe7856 commit c032fb855766d25d91b190af554e1ba86bbe7856 Author: Ed Maste AuthorDate: 2025-02-03 18:23:21 +0000 Commit: Ed Maste CommitDate: 2025-02-04 19:12:21 +0000 netstat: Use bool more widely Following c2aa91745e87 ("netstat: restore printing the "default" keyword, provide -nn option"), consistently use bool where appropriate for commandline flags. Reviewed by: glebius Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48832 --- usr.bin/netstat/main.c | 98 +++++++++++++++++++++++------------------------ usr.bin/netstat/netstat.h | 36 ++++++++--------- 2 files changed, 67 insertions(+), 67 deletions(-) diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c index 371216f4be59..4275ea7821df 100644 --- a/usr.bin/netstat/main.c +++ b/usr.bin/netstat/main.c @@ -194,33 +194,33 @@ static int kresolve_list(struct nlist *_nl); static kvm_t *kvmd; static char *nlistf = NULL, *memf = NULL; -int Aflag; /* show addresses of protocol control block */ -int aflag; /* show all sockets (including servers) */ -static int Bflag; /* show information about bpf consumers */ -int bflag; /* show i/f total bytes in/out */ -int cflag; /* show TCP congestion control stack */ -int Cflag; /* show congestion control algo and vars */ -int dflag; /* show i/f dropped packets */ -int gflag; /* show group (multicast) routing or stats */ -int hflag; /* show counters in human readable format */ -int iflag; /* show interfaces */ -int Lflag; /* show size of listen queues */ -int mflag; /* show memory stats */ +bool Aflag; /* show addresses of protocol control block */ +bool aflag; /* show all sockets (including servers) */ +static bool Bflag; /* show information about bpf consumers */ +bool bflag; /* show i/f total bytes in/out */ +bool cflag; /* show TCP congestion control stack */ +bool Cflag; /* show congestion control algo and vars */ +bool dflag; /* show i/f dropped packets */ +bool gflag; /* show group (multicast) routing or stats */ +bool hflag; /* show counters in human readable format */ +bool iflag; /* show interfaces */ +bool Lflag; /* show size of listen queues */ +bool mflag; /* show memory stats */ int noutputs = 0; /* how much outputs before we exit */ u_int numeric_addr = 0; /* show addresses numerically */ bool numeric_port; /* show ports numerically */ -int Oflag; /* show nhgrp objects*/ -int oflag; /* show nexthop objects*/ -int Pflag; /* show TCP log ID */ -static int pflag; /* show given protocol */ -static int Qflag; /* show netisr information */ -int rflag; /* show routing tables (or routing stats) */ -int Rflag; /* show flow / RSS statistics */ +bool Oflag; /* show nhgrp objects*/ +bool oflag; /* show nexthop objects*/ +bool Pflag; /* show TCP log ID */ +static bool pflag; /* show given protocol */ +static bool Qflag; /* show netisr information */ +bool rflag; /* show routing tables (or routing stats) */ +bool Rflag; /* show flow / RSS statistics */ int sflag; /* show protocol statistics */ -int Wflag; /* wide display */ -int Tflag; /* TCP Information */ -int xflag; /* extra information, includes all socket buffer info */ -int zflag; /* zero stats */ +bool Wflag; /* wide display */ +bool Tflag; /* TCP Information */ +bool xflag; /* extra information, includes all socket buffer info */ +bool zflag; /* zero stats */ int interval; /* repeat interval for i/f stats */ @@ -269,25 +269,25 @@ main(int argc, char *argv[]) #endif break; case 'A': - Aflag = 1; + Aflag = true; break; case 'a': - aflag = 1; + aflag = true; break; case 'B': - Bflag = 1; + Bflag = true; break; case 'b': - bflag = 1; + bflag = true; break; case 'c': - cflag = 1; + cflag = true; break; case 'C': - Cflag = 1; + Cflag = true; break; case 'd': - dflag = 1; + dflag = true; break; case 'F': fib = strtol(optarg, &endptr, 0); @@ -322,22 +322,22 @@ main(int argc, char *argv[]) } break; case 'g': - gflag = 1; + gflag = true; break; case 'h': - hflag = 1; + hflag = true; break; case 'I': { char *cp; - iflag = 1; + iflag = true; for (cp = interface = optarg; isalpha(*cp); cp++) continue; unit = atoi(cp); break; } case 'i': - iflag = 1; + iflag = true; break; case 'j': #ifdef JAIL @@ -349,13 +349,13 @@ main(int argc, char *argv[]) #endif break; case 'L': - Lflag = 1; + Lflag = true; break; case 'M': memf = optarg; break; case 'm': - mflag = 1; + mflag = true; break; case 'N': nlistf = optarg; @@ -365,23 +365,23 @@ main(int argc, char *argv[]) numeric_port = true; break; case 'o': - oflag = 1; + oflag = true; break; case 'O': - Oflag = 1; + Oflag = true; break; case 'P': - Pflag = 1; + Pflag = true; break; case 'p': if ((tp = name2protox(optarg)) == NULL) { xo_errx(EX_DATAERR, "%s: unknown or uninstrumented " "protocol", optarg); } - pflag = 1; + pflag = true; break; case 'Q': - Qflag = 1; + Qflag = true; break; case 'q': noutputs = atoi(optarg); @@ -389,10 +389,10 @@ main(int argc, char *argv[]) noutputs++; break; case 'r': - rflag = 1; + rflag = true; break; case 'R': - Rflag = 1; + Rflag = true; break; case 's': ++sflag; @@ -405,20 +405,20 @@ main(int argc, char *argv[]) break; case 'W': case 'l': - Wflag = 1; + Wflag = true; break; case 'w': interval = atoi(optarg); - iflag = 1; + iflag = true; break; case 'T': - Tflag = 1; + Tflag = true; break; case 'x': - xflag = 1; + xflag = true; break; case 'z': - zflag = 1; + zflag = true; break; case '?': default: @@ -435,7 +435,7 @@ main(int argc, char *argv[]) if (interval <= 0) usage(); ++argv; - iflag = 1; + iflag = true; } if (*argv) { nlistf = *argv; diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h index 7e37b9e5e820..1255bfdf2e57 100644 --- a/usr.bin/netstat/netstat.h +++ b/usr.bin/netstat/netstat.h @@ -37,28 +37,28 @@ #define satosin6(sa) ((struct sockaddr_in6 *)(sa)) #define sin6tosa(sin6) ((struct sockaddr *)(sin6)) -extern int Aflag; /* show addresses of protocol control block */ -extern int aflag; /* show all sockets (including servers) */ -extern int bflag; /* show i/f total bytes in/out */ -extern int cflag; /* show congestion control stats */ -extern int Cflag; /* show congestion control algo and stack */ -extern int dflag; /* show i/f dropped packets */ -extern int gflag; /* show group (multicast) routing or stats */ -extern int hflag; /* show counters in human readable format */ -extern int iflag; /* show interfaces */ -extern int Lflag; /* show size of listen queues */ -extern int mflag; /* show memory stats */ +extern bool Aflag; /* show addresses of protocol control block */ +extern bool aflag; /* show all sockets (including servers) */ +extern bool bflag; /* show i/f total bytes in/out */ +extern bool cflag; /* show congestion control stats */ +extern bool Cflag; /* show congestion control algo and stack */ +extern bool dflag; /* show i/f dropped packets */ +extern bool gflag; /* show group (multicast) routing or stats */ +extern bool hflag; /* show counters in human readable format */ +extern bool iflag; /* show interfaces */ +extern bool Lflag; /* show size of listen queues */ +extern bool mflag; /* show memory stats */ extern int noutputs; /* how much outputs before we exit */ extern u_int numeric_addr; /* show addresses numerically */ extern bool numeric_port; /* show ports numerically */ -extern int Pflag; /* show TCP log ID */ -extern int rflag; /* show routing tables (or routing stats) */ -extern int Rflag; /* show flowid / RSS information */ +extern bool Pflag; /* show TCP log ID */ +extern bool rflag; /* show routing tables (or routing stats) */ +extern bool Rflag; /* show flowid / RSS information */ extern int sflag; /* show protocol statistics */ -extern int Tflag; /* show TCP control block info */ -extern int Wflag; /* wide display */ -extern int xflag; /* extended display, includes all socket buffer info */ -extern int zflag; /* zero stats */ +extern bool Tflag; /* show TCP control block info */ +extern bool Wflag; /* wide display */ +extern bool xflag; /* extended display, includes all socket buffer info */ +extern bool zflag; /* zero stats */ extern int interval; /* repeat interval for i/f stats */