From nobody Sun Feb 8 22:22:31 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 1710158387097634.7203430689059; Mon, 11 Mar 2024 04:59:47 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 117091E83; Mon, 11 Mar 2024 07:59:46 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C1B2F1EC6; Mon, 11 Mar 2024 07:34:30 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1D7121D1E; Mon, 11 Mar 2024 07:31:19 -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 4E3B41CEC for ; Mon, 11 Mar 2024 07:31:17 -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-5-RE69Ol8HPA2C4bSZheZarg-1; Mon, 11 Mar 2024 07:31:15 -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 4401E811E81 for ; Mon, 11 Mar 2024 11:31:15 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id AFB991121306 for ; Mon, 11 Mar 2024 11:31:14 +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: RE69Ol8HPA2C4bSZheZarg-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 13/23] vshCmddefGetOption: Improve readability Date: Mon, 11 Mar 2024 12:30:50 +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: OTAYERWP7IJIOZWAG3JDGM5GN33KLTQS X-Message-ID-Hash: OTAYERWP7IJIOZWAG3JDGM5GN33KLTQS 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: 1710158387713100001 Declare one argument per line, separate disticnt conditions by newline, move some checks earlier. Signed-off-by: Peter Krempa --- tools/vsh.c | 69 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 30 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index af5a576932..de68f93a1f 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -468,9 +468,14 @@ static vshCmdOptDef helpopt =3D { .type =3D VSH_OT_BOOL, .help =3D N_("print help for this function") }; + static const vshCmdOptDef * -vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cmd, const char *name, - uint64_t *opts_seen, size_t *opt_index, char **optstr, +vshCmddefGetOption(vshControl *ctl, + const vshCmdDef *cmd, + const char *name, + uint64_t *opts_seen, + size_t *opt_index, + char **optstr, bool report) { size_t i; @@ -482,39 +487,43 @@ vshCmddefGetOption(vshControl *ctl, const vshCmdDef *= cmd, const char *name, for (i =3D 0; cmd->opts && cmd->opts[i].name; i++) { const vshCmdOptDef *opt =3D &cmd->opts[i]; - if (STREQ(opt->name, name)) { - if (opt->type =3D=3D VSH_OT_ALIAS) { - char *value; - - /* Two types of replacements: - opt->help =3D "string": straight replacement of name - opt->help =3D "string=3Dvalue": treat boolean flag as - alias of option and its default value */ - alias =3D g_strdup(opt->help); - name =3D alias; - if ((value =3D strchr(name, '=3D'))) { - *value =3D '\0'; - if (*optstr) { - if (report) - vshError(ctl, _("invalid '=3D' after option --= %1$s"), - opt->name); - return NULL; - } - *optstr =3D g_strdup(value + 1); + if (STRNEQ(opt->name, name)) + continue; + + if (opt->type =3D=3D VSH_OT_ALIAS) { + char *value; + + /* Two types of replacements: + opt->help =3D "string": straight replacement of name + opt->help =3D "string=3Dvalue": treat boolean flag as + alias of option and its default value */ + alias =3D g_strdup(opt->help); + name =3D alias; + if ((value =3D strchr(name, '=3D'))) { + *value =3D '\0'; + if (*optstr) { + if (report) + vshError(ctl, _("invalid '=3D' after option --%1$s= "), + opt->name); + return NULL; } - continue; + *optstr =3D g_strdup(value + 1); } - if ((*opts_seen & (1ULL << i)) && opt->type !=3D VSH_OT_ARGV) { - if (report) - vshError(ctl, _("option --%1$s already seen"), name); - return NULL; - } - *opts_seen |=3D 1ULL << i; - *opt_index =3D i; - return opt; + continue; } + + if ((*opts_seen & (1ULL << i)) && opt->type !=3D VSH_OT_ARGV) { + if (report) + vshError(ctl, _("option --%1$s already seen"), name); + return NULL; + } + + *opts_seen |=3D 1ULL << i; + *opt_index =3D i; + return opt; } + /* The 'help' command ignores extra options */ if (STRNEQ(cmd->name, "help") && report) { vshError(ctl, _("command '%1$s' doesn't support option --%2$s"), cmd->name, name); --=20 2.44.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org