From nobody Fri Jan 07 05:59:54 2022 X-Original-To: dev-commits-src-all@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 90D521939F11; Fri, 7 Jan 2022 05:59: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 4JVXcV24ykz4Rwy; Fri, 7 Jan 2022 05:59: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 239D82DDBC; Fri, 7 Jan 2022 05:59:54 +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 2075xsOj021268; Fri, 7 Jan 2022 05:59:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2075xsZX021267; Fri, 7 Jan 2022 05:59:54 GMT (envelope-from git) Date: Fri, 7 Jan 2022 05:59:54 GMT Message-Id: <202201070559.2075xsZX021267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Scott Long Subject: git: 638e2a132e38 - main - Fix formatting of the usage() output List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: scottl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 638e2a132e38b51b385b2731822294c73621aea9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641535194; 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=4mQbYpFgjG3pd5Q8lFZV0/dT72uBV10XgxoXAPEXH/Q=; b=Nyp935GQ8fOTT0FRgFM9FpuGHk3JHs29YpQ7FCG3f08XASVS/JhbokynVp/ino1vZ9aHZm RjqEe8TvyB5Nfp/RnD9cbaiLq67G4oJ/1+6cSjp2p5Zv5e4kwtg6s83XnfLtBLTQPMVcMt jjTwwbbzPowzLbPt9PN6+kDDlg/RItLh/HZJ5xiyLeYCCIxW8RTMzjE6hYnZz0/cccrPKH wX+FQvyO0+eBuQojTPMFN4Dy2/qt/bHhRDuCFN7A9h+SuRuiRG98E6z+Yuo3Ro4m3lS8qo 39SInUWVGbVsEIKFqUEcxL5zSkiAve3qdgcIw1a+zuWU7HGeHQsu/6mWoSUzqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641535194; a=rsa-sha256; cv=none; b=GKo4hbs0g9S6DiZBMqupB2qyFrgt/CRsA3zFlQvcQ9K4EtlTn3JL/YLy3rhyORfYLch2RQ xV/NOzc2dtUyE7dDo+HwS0O0zPtGQLBDX37xFJdyLZSQbgG7cc6hQwXflB4J7pTk6/QLEU gfJTGdHCDtXB7x553yX8BqoXkDZyi0d5wnfhbpt18ibh3ptxCBnksJDsnKUttHHEKPvI2q mxEi4TXs9z4UMBaHzQrt11PhKdW55dxNnre6QTeGHxMkq1xr3OfdVN0/koHuZDy0YvP2fd wWjekQuTt8Rn7dLnDkIkjIzwYUSt8ixu7Lkl7cZfDdYOUxGTdzfJ5QP7oOnBGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by scottl: URL: https://cgit.FreeBSD.org/src/commit/?id=638e2a132e38b51b385b2731822294c73621aea9 commit 638e2a132e38b51b385b2731822294c73621aea9 Author: Scott Long AuthorDate: 2022-01-07 05:59:18 +0000 Commit: Scott Long CommitDate: 2022-01-07 05:59:18 +0000 Fix formatting of the usage() output --- usr.sbin/mpsutil/mps_slot.c | 2 +- usr.sbin/mpsutil/mpsutil.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/mpsutil/mps_slot.c b/usr.sbin/mpsutil/mps_slot.c index bb4a7324c461..396d5706cd5f 100644 --- a/usr.sbin/mpsutil/mps_slot.c +++ b/usr.sbin/mpsutil/mps_slot.c @@ -113,4 +113,4 @@ slot_set(int argc, char **argv) } MPS_COMMAND(slot, set, slot_set, "status " - "", "Set status of the slot in the directly attached enclosure"); + "", "\n Set status of the slot in the directly attached enclosure"); diff --git a/usr.sbin/mpsutil/mpsutil.c b/usr.sbin/mpsutil/mpsutil.c index 51fad0c9b981..cb9563cefa60 100644 --- a/usr.sbin/mpsutil/mpsutil.c +++ b/usr.sbin/mpsutil/mpsutil.c @@ -65,10 +65,10 @@ usage(void) } else { (*cmd)->handler(&args, &desc); if (strncmp((*cmd)->set, "top", 3) == 0) - fprintf(stderr, "%s %-30s\t%s\n", + fprintf(stderr, "%-16s %-28s%s\n", (*cmd)->name, args, desc); else - fprintf(stderr, "%s %s %-30s\t%s\n", + fprintf(stderr, "%-5s %-10s %-28s%s\n", (*cmd)->set, (*cmd)->name, args, desc); } } @@ -87,7 +87,7 @@ version(int ac, char **av) return (0); } -MPS_COMMAND(top, version, version, "", "version") +MPS_COMMAND(top, version, version, "", "Version number") int main(int ac, char **av)