From nobody Tue Feb 11 18:23:52 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 4YsqZw5qYXz5mTqS; Tue, 11 Feb 2025 18:23:52 +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 4YsqZw3L61z3mJy; Tue, 11 Feb 2025 18:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739298232; 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=4txCab7ID7ay/I28JkQF8TlVqqHnssVaAE16NgjTfMk=; b=BFn9Jl5ufEDaBQcr/akD6c9LnerSqEfMUC3OVwRs+GWP6BFkob9lvFyUJ4TsqnVxdtUU1b nBGt64uxZ01ONtUmZ6sDpX0fHTDRhuH3EGGWWVcuAO8ApJIHOvmeiFGqged0Nb9HfHLMSF yuEcCaIIQGioerqkHwkfvTMJI7uemG2lzZNJLfbS6x7Z6wzFbAr2K/QkzMpP7a5ef7HwH7 Gn552oNs2SnrJyhFnHeCnyrBs5DQ6NzNpPNjao6daGuQmy0wtcX20wCp0dV6QfuIFjmlRv ho+DFmJ8ybBl55c8unMqZQG09pPzGdZBkPjwYQdbOay0hc4xyEAGQsBetXfUDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739298232; 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=4txCab7ID7ay/I28JkQF8TlVqqHnssVaAE16NgjTfMk=; b=g+zljowqF70QLFhZiX42odfDR6i+F9r2m1tP+U4UdMaCEpj4ykv57A68YY88C1PmQTL3O8 I6DiovS3NVn29BDhOp2xhHf5RKPSmZH0wa+a0NbPYG4kpiT3qbQaXRxMf+AOJtXHVXu1dI okvHBnwfkpgH7gRYT/qWKipyy5oaVewlA/AIlDlSBjm06UCeQakmCaQ3Ga5/JPg97zuHjA 55b5FmpQCY5mHvC7TQ3E4EH/+HgQ01guDBDph0aMopp1l2x1+tXlhZPsJhKV+eIrwKe96p 7R0CQbMxXiPW/Vr/oR5G6+sUeTwIaZwKrtmHjf8t7ekNoB63oq7z/fZc2O2+Mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739298232; a=rsa-sha256; cv=none; b=mC/W/7ck4Ag0YA3/ylyJHlev9wTmJhSaDuM5XAiLDeQOrAzJTJqr4dRiq7xpzyr927fCWX zRDv1FBhpuvYpy8p5MOU7f2nJTDOFHotRnmsoclgg3T7pHS2zfaCthKPmVDOaLNGkHHYlf xIdbySrDmng164He7980ivxSb+FwCJ9BBjqeyJhcmvSbiJfe7fMhCmetp6/gRGjLs+B+pr dkkyoJ3CzD5hjmt3ZehKix8k6p5bFrhPS8uFQ2NlIpLstRGSbJv2iJMvbycU8XgQtcw+Ew AI8mb1jbRRQc054uHFXU1FsGTA+pYri9uwY0m28krnqh4/9pjSmaHxY3V+5gcw== 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 4YsqZw2jr9z7nf; Tue, 11 Feb 2025 18:23:52 +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 51BINqLO027224; Tue, 11 Feb 2025 18:23:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51BINqF6027221; Tue, 11 Feb 2025 18:23:52 GMT (envelope-from git) Date: Tue, 11 Feb 2025 18:23:52 GMT Message-Id: <202502111823.51BINqF6027221@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 01a46c7dc002 - main - sockstat: use bool for flags 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01a46c7dc002bb4d2a35bdcebf0ed194846bfe01 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=01a46c7dc002bb4d2a35bdcebf0ed194846bfe01 commit 01a46c7dc002bb4d2a35bdcebf0ed194846bfe01 Author: Gleb Smirnoff AuthorDate: 2025-02-11 18:23:15 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-11 18:23:15 +0000 sockstat: use bool for flags No functional change. --- usr.bin/sockstat/sockstat.c | 75 +++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c index 3347978c8b47..6283f600b322 100644 --- a/usr.bin/sockstat/sockstat.c +++ b/usr.bin/sockstat/sockstat.c @@ -62,6 +62,7 @@ #include #include #include +#include #include #include #include @@ -78,24 +79,24 @@ #define sstosun(ss) ((struct sockaddr_un *)(ss)) #define sstosa(ss) ((struct sockaddr *)(ss)) -static int opt_4; /* Show IPv4 sockets */ -static int opt_6; /* Show IPv6 sockets */ -static int opt_C; /* Show congestion control */ -static int opt_c; /* Show connected sockets */ -static int opt_f; /* Show FIB numbers */ -static int opt_I; /* Show spliced socket addresses */ -static int opt_i; /* Show inp_gencnt */ +static bool opt_4; /* Show IPv4 sockets */ +static bool opt_6; /* Show IPv6 sockets */ +static bool opt_C; /* Show congestion control */ +static bool opt_c; /* Show connected sockets */ +static bool opt_f; /* Show FIB numbers */ +static bool opt_I; /* Show spliced socket addresses */ +static bool opt_i; /* Show inp_gencnt */ static int opt_j; /* Show specified jail */ -static int opt_L; /* Don't show IPv4 or IPv6 loopback sockets */ -static int opt_l; /* Show listening sockets */ -static int opt_n; /* Don't resolve UIDs to user names */ -static int opt_q; /* Don't show header */ -static int opt_S; /* Show protocol stack if applicable */ -static int opt_s; /* Show protocol state if applicable */ -static int opt_U; /* Show remote UDP encapsulation port number */ -static int opt_u; /* Show Unix domain sockets */ -static int opt_v; /* Verbose mode */ -static int opt_w; /* Wide print area for addresses */ +static bool opt_L; /* Don't show IPv4 or IPv6 loopback sockets */ +static bool opt_l; /* Show listening sockets */ +static bool opt_n; /* Don't resolve UIDs to user names */ +static bool opt_q; /* Don't show header */ +static bool opt_S; /* Show protocol stack if applicable */ +static bool opt_s; /* Show protocol state if applicable */ +static bool opt_U; /* Show remote UDP encapsulation port number */ +static bool opt_u; /* Show Unix domain sockets */ +static u_int opt_v; /* Verbose mode */ +static bool opt_w; /* Wide print area for addresses */ /* * Default protocols to use if no -P was defined. @@ -1340,7 +1341,7 @@ display(void) struct sock *s; int n, pos; - if (opt_q != 1) { + if (!opt_q) { printf("%-8s %-10s %-5s %-3s %-6s %-*s %-*s", "USER", "COMMAND", "PID", "FD", "PROTO", opt_w ? 45 : 21, "LOCAL ADDRESS", @@ -1493,25 +1494,25 @@ main(int argc, char *argv[]) while ((o = getopt(argc, argv, "46CcfIij:Llnp:P:qSsUuvw")) != -1) switch (o) { case '4': - opt_4 = 1; + opt_4 = true; break; case '6': - opt_6 = 1; + opt_6 = true; break; case 'C': - opt_C = 1; + opt_C = true; break; case 'c': - opt_c = 1; + opt_c = true; break; case 'f': - opt_f = 1; + opt_f = true; break; case 'I': - opt_I = 1; + opt_I = true; break; case 'i': - opt_i = 1; + opt_i = true; break; case 'j': opt_j = jail_getid(optarg); @@ -1519,13 +1520,13 @@ main(int argc, char *argv[]) errx(1, "jail_getid: %s", jail_errmsg); break; case 'L': - opt_L = 1; + opt_L = true; break; case 'l': - opt_l = 1; + opt_l = true; break; case 'n': - opt_n = 1; + opt_n = true; break; case 'p': parse_ports(optarg); @@ -1534,25 +1535,25 @@ main(int argc, char *argv[]) protos_defined = parse_protos(optarg); break; case 'q': - opt_q = 1; + opt_q = true; break; case 'S': - opt_S = 1; + opt_S = true; break; case 's': - opt_s = 1; + opt_s = true; break; case 'U': - opt_U = 1; + opt_U = true; break; case 'u': - opt_u = 1; + opt_u = true; break; case 'v': ++opt_v; break; case 'w': - opt_w = 1; + opt_w = true; break; default: usage(); @@ -1608,13 +1609,13 @@ main(int argc, char *argv[]) err(1, "Unable to apply pwd commands limits"); if ((!opt_4 && !opt_6) && protos_defined != -1) - opt_4 = opt_6 = 1; + opt_4 = opt_6 = true; if (!opt_4 && !opt_6 && !opt_u) - opt_4 = opt_6 = opt_u = 1; + opt_4 = opt_6 = opt_u = true; if ((opt_4 || opt_6) && protos_defined == -1) protos_defined = set_default_protos(); if (!opt_c && !opt_l) - opt_c = opt_l = 1; + opt_c = opt_l = true; if (opt_4 || opt_6) { for (i = 0; i < protos_defined; i++)