From nobody Fri Jan 07 13:30:52 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 61B5719406C1; Fri, 7 Jan 2022 13:30:54 +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 4JVkcs620dz4hZZ; Fri, 7 Jan 2022 13:30:53 +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 A69F3422B; Fri, 7 Jan 2022 13:30:52 +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 207DUqNw030545; Fri, 7 Jan 2022 13:30:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 207DUq0v030544; Fri, 7 Jan 2022 13:30:52 GMT (envelope-from git) Date: Fri, 7 Jan 2022 13:30:52 GMT Message-Id: <202201071330.207DUq0v030544@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: 5620ab6c8e3f - stable/13 - kldstat(8): Fix indentation, whitespace to tabs. 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: 5620ab6c8e3fabe02cdb80c6d706f407e494ee62 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=TLxhaApG1JcCadT/9FU1WvY6DMPpxtRDUWsURgFWBTA=; b=wp1mrn2IKZ7Rv9eKA77Lz4thos5lzASnHfhDzZCsWOPo1SI/Z14EiEP1PU57XrySsnxLO1 Ww0Brlt22+i9oXZlW53XPvrnzVDwXg7VBuWHbha7t0yMQ4Mc5EnO8m4hY1J3ZpYvhAX6hE +A9LhPcm3n07zxta4s07JpI+r37U8p+fqOBqJeOLf9/PzcjCRyt/VLMSt6sFmW5HJnyQpO aQUbs7ONoQFyAuCMXhxF3tojYQEVmEBUlZ1uDfW5K7UPh/LiYRs5hUy2xzODlpcCpAgA4e o6KsYRGqOCW8dGuZ6Z3pPhKm0XHCkmFBSFK5JFCVdcknBlRx0CxXgFE7BDyyVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641562254; a=rsa-sha256; cv=none; b=rPHoIfmDccQE2tvy+MEf7KHCBfAw6G+aDzCWWY4KFB3iKgdkHy4vnm8Ptlmwc96z8TD5O7 hSv6+IrKTV7/qg5+zX1TCO5e6gpAPOgw/egSKLRgmmU4OX4lD5AcIU7TUGqSjrxitutcOz 7G2YBlytyBIKGFT7N9Gw/GKGAMzx1d5nJNo7xPgvyaZNnHecWaRmeWNbY4N4kK2HDmCzjF RM29CsK9dDnAdf0fNbrFO79bCTOi1fylnKIiERkT8kDE+bRi27Vc5BjPxWIOHjBz1pN1iv HaPuLJWoaIStREmb/18jbmJKnZmQzVPyg2n491F3xF+qtiFCjLZW6YVplNZvXw== 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=5620ab6c8e3fabe02cdb80c6d706f407e494ee62 commit 5620ab6c8e3fabe02cdb80c6d706f407e494ee62 Author: Hans Petter Selasky AuthorDate: 2021-11-09 21:09:54 +0000 Commit: Hans Petter Selasky CommitDate: 2022-01-07 13:23:09 +0000 kldstat(8): Fix indentation, whitespace to tabs. No functional change intended. Differential revision: https://reviews.freebsd.org/D32502 Submitted by: christos@ Sponsored by: NVIDIA Networking (cherry picked from commit 337c814316ef11437649cb43027468693555a5dd) --- sbin/kldstat/kldstat.c | 261 +++++++++++++++++++++++++------------------------ 1 file changed, 133 insertions(+), 128 deletions(-) diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c index 38918890b879..0925223da23a 100644 --- a/sbin/kldstat/kldstat.c +++ b/sbin/kldstat/kldstat.c @@ -40,166 +40,171 @@ __FBSDID("$FreeBSD$"); #include #include -#define POINTER_WIDTH ((int)(sizeof(void *) * 2 + 2)) +#define POINTER_WIDTH ((int)(sizeof(void *) * 2 + 2)) static int showdata = 0; static void printmod(int modid) { - struct module_stat stat; - - bzero(&stat, sizeof(stat)); - stat.version = sizeof(struct module_stat); - 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); + struct module_stat stat; + + bzero(&stat, sizeof(stat)); + stat.version = sizeof(struct module_stat); + 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); } } static void printfile(int fileid, int verbose, int humanized) { - struct kld_file_stat stat; - int modid; - char buf[5]; - - stat.version = sizeof(struct kld_file_stat); - if (kldstat(fileid, &stat) < 0) { - err(1, "can't stat file id %d", fileid); - } 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); + struct kld_file_stat stat; + int modid; + char buf[5]; + + stat.version = sizeof(struct kld_file_stat); + if (kldstat(fileid, &stat) < 0) { + err(1, "can't stat file id %d", fileid); } else { - printf("%2d %4d %*p %8zx %s", - stat.id, stat.refs, POINTER_WIDTH, stat.address, stat.size, - stat.name); + 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); + } } - } - - if (verbose) { - printf(" (%s)\n", stat.pathname); - printf("\tContains modules:\n"); - printf("\t\t Id Name\n"); - for (modid = kldfirstmod(fileid); modid > 0; - modid = modfnext(modid)) - printmod(modid); - } else - printf("\n"); + + if (verbose) { + printf(" (%s)\n", stat.pathname); + printf("\tContains modules:\n"); + printf("\t\t Id Name\n"); + for (modid = kldfirstmod(fileid); modid > 0; modid = modfnext(modid)) + printmod(modid); + } else + printf("\n"); } static void usage(void) { - fprintf(stderr, "usage: kldstat [-d] [-h] [-q] [-v] [-i id] [-n filename]\n"); - fprintf(stderr, " kldstat [-d] [-q] [-m modname]\n"); - exit(1); + fprintf(stderr, "usage: kldstat [-d] [-h] [-q] [-v] [-i id] [-n filename]\n"); + fprintf(stderr, " kldstat [-d] [-q] [-m modname]\n"); + exit(1); } int main(int argc, char** argv) { - int c; - int humanized = 0; - int verbose = 0; - int fileid = 0; - int quiet = 0; - char* filename = NULL; - char* modname = NULL; - char* p; - - while ((c = getopt(argc, argv, "dhi:m:n:qv")) != -1) - switch (c) { - case 'd': - showdata = 1; - break; - case 'h': - humanized = 1; - break; - case 'i': - fileid = (int)strtoul(optarg, &p, 10); - if (*p != '\0') + int c; + int humanized = 0; + int verbose = 0; + int fileid = 0; + int quiet = 0; + char* filename = NULL; + char* modname = NULL; + char* p; + + while ((c = getopt(argc, argv, "dhi:m:n:qv")) != -1) + switch (c) { + case 'd': + showdata = 1; + break; + case 'h': + humanized = 1; + break; + case 'i': + fileid = (int)strtoul(optarg, &p, 10); + if (*p != '\0') + usage(); + break; + case 'm': + modname = optarg; + break; + case 'n': + filename = optarg; + break; + case 'q': + quiet = 1; + break; + case 'v': + verbose = 1; + break; + default: + usage(); + } + argc -= optind; + argv += optind; + + if (argc != 0) usage(); - break; - case 'm': - modname = optarg; - break; - case 'n': - filename = optarg; - break; - case 'q': - quiet = 1; - break; - case 'v': - verbose = 1; - break; - default: - usage(); - } - argc -= optind; - argv += optind; - if (argc != 0) - usage(); + if (modname != NULL) { + int modid; + struct module_stat stat; - 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; + } + + stat.version = sizeof(struct module_stat); + if (modstat(modid, &stat) < 0) + warn("can't stat module id %d", modid); + else { + if (showdata) { + printf("Id Refs Name data..(int, uint, ulong)\n"); + printf("%3d %4d %s (%d, %u, 0x%lx)\n", + stat.id, stat.refs, stat.name, + stat.data.intval, stat.data.uintval, + stat.data.ulongval); + } else { + printf("Id Refs Name\n"); + printf("%3d %4d %s\n", stat.id, stat.refs, + stat.name); + } + } - if ((modid = modfind(modname)) < 0) { - if (!quiet) - warn("can't find module %s", modname); - return 1; - } else if (quiet) { - return 0; + return 0; } - stat.version = sizeof(struct module_stat); - if (modstat(modid, &stat) < 0) - warn("can't stat module id %d", modid); - else { - if (showdata) { - printf("Id Refs Name data..(int, uint, ulong)\n"); - printf("%3d %4d %s (%d, %u, 0x%lx)\n", stat.id, stat.refs, stat.name, - stat.data.intval, stat.data.uintval, stat.data.ulongval); - } else { - printf("Id Refs Name\n"); - printf("%3d %4d %s\n", stat.id, stat.refs, stat.name); + if (filename != NULL) { + if ((fileid = kldfind(filename)) < 0) { + if (!quiet) + warn("can't find file %s", filename); + return 1; + } else if (quiet) { + return 0; } } + if (humanized) + printf("Id Refs Address%*c %5s Name\n", POINTER_WIDTH - 7, + ' ', "Size"); + else + printf("Id Refs Address%*c %8s Name\n", POINTER_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; - } - - if (filename != NULL) { - if ((fileid = kldfind(filename)) < 0) { - if (!quiet) - warn("can't find file %s", filename); - return 1; - } else if (quiet) { - return 0; - } - } - - if (humanized) - printf("Id Refs Address%*c %5s Name\n", POINTER_WIDTH - 7, ' ', "Size"); - else - printf("Id Refs Address%*c %8s Name\n", POINTER_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; }