From nobody Sun Feb 8 20:58:56 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1710158191566195.1958939206902; Mon, 11 Mar 2024 04:56:31 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 5451211C; Mon, 11 Mar 2024 07:56:30 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 925351DD1; Mon, 11 Mar 2024 07:34:06 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D31B919C0; Mon, 11 Mar 2024 07:31:15 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 52D951A6E for ; Mon, 11 Mar 2024 07:31:15 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-397-Td3bbCjNNiOVvlVpUrOE8A-1; Mon, 11 Mar 2024 07:31:13 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 73959185A784 for ; Mon, 11 Mar 2024 11:31:13 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id E03E2111E3F3 for ; Mon, 11 Mar 2024 11:31:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: Td3bbCjNNiOVvlVpUrOE8A-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 11/23] vshCmddefHelp: Refactor printing of help (list of arguments) Date: Mon, 11 Mar 2024 12:30:48 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: VLSV3CHV37H4HYH2SCNQ235R3GXXA4ZH X-Message-ID-Hash: VLSV3CHV37H4HYH2SCNQ235R3GXXA4ZH X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1710158192906100001 Extract flag check to a separate variable and replace ternary operators by normal conditions and directly output the text rather than using extra variable to improve readability. Signed-off-by: Peter Krempa --- tools/vsh.c | 48 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 688161beda..add50fe670 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -630,47 +630,63 @@ vshCmddefHelp(const vshCmdDef *def) if (def->opts) { const vshCmdOptDef *opt; for (opt =3D def->opts; opt->name; opt++) { - const char *fmt =3D "%s"; + bool required_option =3D opt->flags & VSH_OFLAG_REQ; + switch (opt->type) { case VSH_OT_BOOL: - fmt =3D "[--%s]"; + fprintf(stdout, " [--%s]", opt->name); break; + case VSH_OT_INT: - /* xgettext:c-format */ - fmt =3D ((opt->flags & VSH_OFLAG_REQ) ? "<%s>" - : _("[--%1$s ]")); + if (required_option) { + fprintf(stdout, " <%s>", opt->name); + } else { + fprintf(stdout, _(" [--%1$s ]"), opt->name); + } + if (!(opt->flags & VSH_OFLAG_REQ_OPT)) shortopt =3D true; break; + case VSH_OT_STRING: - /* xgettext:c-format */ - fmt =3D _("[--%1$s ]"); + fprintf(stdout, _(" [--%1$s ]"), opt->name); + if (!(opt->flags & VSH_OFLAG_REQ_OPT)) shortopt =3D true; break; + case VSH_OT_DATA: - fmt =3D ((opt->flags & VSH_OFLAG_REQ) ? "<%s>" : "[<%s>]"); + if (required_option) { + fprintf(stdout, " <%s>", opt->name); + } else { + fprintf(stdout, " [<%s>]", opt->name); + } + if (!(opt->flags & VSH_OFLAG_REQ_OPT)) shortopt =3D true; break; + case VSH_OT_ARGV: - /* xgettext:c-format */ if (shortopt) { - fmt =3D (opt->flags & VSH_OFLAG_REQ) - ? _("{[--%1$s] }...") - : _("[[--%1$s] ]..."); + if (required_option) { + fprintf(stdout, _(" {[--%1$s] }..."), opt-= >name); + } else { + fprintf(stdout, _(" [[--%1$s] ]..."), opt-= >name); + } } else { - fmt =3D (opt->flags & VSH_OFLAG_REQ) ? _("<%1$s>...") - : _("[<%1$s>]..."); + if (required_option) { + fprintf(stdout, " <%s>...", opt->name); + } else { + fprintf(stdout, " [<%s>]...", opt->name); + } } break; + case VSH_OT_ALIAS: case VSH_OT_NONE: /* aliases are intentionally undocumented */ continue; } - fputc(' ', stdout); - fprintf(stdout, fmt, opt->name); } } fputc('\n', stdout); --=20 2.44.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org