From nobody Fri Jan 07 13:30:53 2022 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 05C0D194044D; Fri, 7 Jan 2022 13:30:55 +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 4JVkct1vRnz4hJQ; Fri, 7 Jan 2022 13:30:54 +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 BC8B03C7A; Fri, 7 Jan 2022 13:30:53 +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 207DUrYv030569; Fri, 7 Jan 2022 13:30:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 207DUr6V030568; Fri, 7 Jan 2022 13:30:53 GMT (envelope-from git) Date: Fri, 7 Jan 2022 13:30:53 GMT Message-Id: <202201071330.207DUr6V030568@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: d7c7e033dad0 - stable/13 - kldstat(8): style(9) fixes. 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: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d7c7e033dad005448de3630c17a7f7bb2f93a5f3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641562254; 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=VRs7mFfNpjAErbkfYrsvVGd4KWTqbYyIjDIdzlANyRc=; b=hDDumHtJlmONfJo9FfS4/1t2tPHRLAhxEYH9bIY4NS4fSx/ytLjLk5FUKzxtDP+W3kK7Vs y4mR/+izy0UIG6GIhsQ3lNq6N3n6dpZkAvV2Gq4yjjiUWHu3PPOj5ubFWxVXj8IrvW43o/ RZPz1AyQn0Z91HahbDoxm0sfi5s/giWN/LarTe0ImCMhUgulMp5ZIv9qGk1rbD6r38aaQJ q7sRPInj4smef14yS4vpu5E8OhD4KD/j7tEcgT8pCqbnsfW3EQw+wdYVV8xEtht42qL2Vn SF/SbNJClEofmZMF6LihGZkEswap8J2UpnKjSzibXgJD1VfNIbkcbwQKPcOYjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641562254; a=rsa-sha256; cv=none; b=Z36Mdbrhy1/lrvFISTC79pkEue8F8FDwQnY+cTqTdjUgJ8rrSiRXaGdGcjNGGpQVhPhQ9V 0bt7bezJCU2atovtfWwboZ86dhIBU2jSHwWC10ilNi0K0VxsYCZolCAJAwtnqK1docQvJA ih7LEwIJmfK86vLc3lcgzPGiFvJGt3QxhbEySeG8cHW/Yq/0idRCA7npKe6jbnUOey00el xRpT+KD28c2LJpDWbagF0LfHev275occy9K5aZkcrF36xtFC0OfouCJDvdOnG7pKiURTK6 3CVd4irTVvJwQiOcCa46arCqu60m0AyFS6AEVIszKVx8zxn575U4ZAX3Gf/Hog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=d7c7e033dad005448de3630c17a7f7bb2f93a5f3 commit d7c7e033dad005448de3630c17a7f7bb2f93a5f3 Author: Hans Petter Selasky AuthorDate: 2021-11-09 21:09:59 +0000 Commit: Hans Petter Selasky CommitDate: 2022-01-07 13:23:09 +0000 kldstat(8): style(9) fixes. No functional change intended. Differential revision: https://reviews.freebsd.org/D32506 Submitted by: christos@ Sponsored by: NVIDIA Networking (cherry picked from commit 83237efcdbc183e14a27a93579e53bb571756d6a) --- sbin/kldstat/kldstat.c | 107 +++++++++++++++++++++++++------------------------ 1 file changed, 54 insertions(+), 53 deletions(-) diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c index 0925223da23a..b8e4fd6e4b5d 100644 --- a/sbin/kldstat/kldstat.c +++ b/sbin/kldstat/kldstat.c @@ -29,18 +29,23 @@ #include __FBSDID("$FreeBSD$"); -#include -#include -#include -#include -#include #include #include #include #include + +#include +#include +#include +#include #include +#include + +#define PTR_WIDTH ((int)(sizeof(void *) * 2 + 2)) -#define POINTER_WIDTH ((int)(sizeof(void *) * 2 + 2)) +static void printmod(int); +static void printfile(int, int, int); +static void usage(void) __dead2; static int showdata = 0; @@ -51,16 +56,16 @@ printmod(int modid) bzero(&stat, sizeof(stat)); stat.version = sizeof(struct module_stat); - if (modstat(modid, &stat) < 0) + if (modstat(modid, &stat) < 0) { warn("can't stat module id %d", modid); - else { - if (showdata) - printf("\t\t%3d %s (%d, %u, 0x%lx)\n", stat.id, - stat.name, stat.data.intval, stat.data.uintval, - stat.data.ulongval); - else - printf("\t\t%3d %s\n", stat.id, stat.name); + return; } + if (showdata) { + printf("\t\t%3d %s (%d, %u, 0x%lx)\n", stat.id, + stat.name, stat.data.intval, stat.data.uintval, + stat.data.ulongval); + } else + printf("\t\t%3d %s\n", stat.id, stat.name); } static void @@ -71,21 +76,19 @@ printfile(int fileid, int verbose, int humanized) char buf[5]; stat.version = sizeof(struct kld_file_stat); - if (kldstat(fileid, &stat) < 0) { + if (kldstat(fileid, &stat) < 0) err(1, "can't stat file id %d", fileid); + if (humanized) { + humanize_number(buf, sizeof(buf), stat.size, + "", HN_AUTOSCALE, HN_DECIMAL | HN_NOSPACE); + + printf("%2d %4d %*p %5s %s", + stat.id, stat.refs, PTR_WIDTH, stat.address, + buf, stat.name); } else { - if (humanized) { - humanize_number(buf, sizeof(buf), stat.size, - "", HN_AUTOSCALE, HN_DECIMAL | HN_NOSPACE); - - printf("%2d %4d %*p %5s %s", - stat.id, stat.refs, POINTER_WIDTH, stat.address, - buf, stat.name); - } else { - printf("%2d %4d %*p %8zx %s", - stat.id, stat.refs, POINTER_WIDTH, stat.address, - stat.size, stat.name); - } + printf("%2d %4d %*p %8zx %s", + stat.id, stat.refs, PTR_WIDTH, stat.address, + stat.size, stat.name); } if (verbose) { @@ -98,27 +101,28 @@ printfile(int fileid, int verbose, int humanized) printf("\n"); } -static void +static void __dead2 usage(void) { - fprintf(stderr, "usage: kldstat [-d] [-h] [-q] [-v] [-i id] [-n filename]\n"); - fprintf(stderr, " kldstat [-d] [-q] [-m modname]\n"); + fprintf(stderr, "usage: %1$s [-dhqv] [-i id] [-n filename]\n" + " %1$s [-dq] [-m modname]\n", getprogname()); exit(1); } int -main(int argc, char** argv) +main(int argc, char *argv[]) { - int c; + struct module_stat stat; int humanized = 0; int verbose = 0; int fileid = 0; int quiet = 0; - char* filename = NULL; - char* modname = NULL; - char* p; + int c, modid; + char *filename = NULL; + char *modname = NULL; + char *p; - while ((c = getopt(argc, argv, "dhi:m:n:qv")) != -1) + while ((c = getopt(argc, argv, "dhi:m:n:qv")) != -1) { switch (c) { case 'd': showdata = 1; @@ -146,6 +150,7 @@ main(int argc, char** argv) default: usage(); } + } argc -= optind; argv += optind; @@ -153,16 +158,12 @@ main(int argc, char** argv) usage(); if (modname != NULL) { - int modid; - struct module_stat stat; - if ((modid = modfind(modname)) < 0) { if (!quiet) warn("can't find module %s", modname); - return 1; - } else if (quiet) { - return 0; - } + return (1); + } else if (quiet) + return (0); stat.version = sizeof(struct module_stat); if (modstat(modid, &stat) < 0) @@ -181,30 +182,30 @@ main(int argc, char** argv) } } - return 0; + return (0); } if (filename != NULL) { if ((fileid = kldfind(filename)) < 0) { if (!quiet) warn("can't find file %s", filename); - return 1; - } else if (quiet) { - return 0; - } + return (1); + } else if (quiet) + return (0); } - if (humanized) - printf("Id Refs Address%*c %5s Name\n", POINTER_WIDTH - 7, + if (humanized) { + printf("Id Refs Address%*c %5s Name\n", PTR_WIDTH - 7, ' ', "Size"); - else - printf("Id Refs Address%*c %8s Name\n", POINTER_WIDTH - 7, + } else { + printf("Id Refs Address%*c %8s Name\n", PTR_WIDTH - 7, ' ', "Size"); + } if (fileid != 0) printfile(fileid, verbose, humanized); else for (fileid = kldnext(0); fileid > 0; fileid = kldnext(fileid)) printfile(fileid, verbose, humanized); - return 0; + return (0); }