From owner-dev-commits-src-main@freebsd.org Fri Apr 9 22:38:41 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6591F5C0F76; Fri, 9 Apr 2021 22:38:41 +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 4FHChx13Jcz4jmM; Fri, 9 Apr 2021 22:38:41 +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 1525F261B9; Fri, 9 Apr 2021 22:38:41 +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 139McfXo019475; Fri, 9 Apr 2021 22:38:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 139McfSr019474; Fri, 9 Apr 2021 22:38:41 GMT (envelope-from git) Date: Fri, 9 Apr 2021 22:38:41 GMT Message-Id: <202104092238.139McfSr019474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 066b096d13a1 - main - efivar: use bool for booleans MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 066b096d13a150e802c7142602d821c0b494487b Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Apr 2021 22:38:41 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=066b096d13a150e802c7142602d821c0b494487b commit 066b096d13a150e802c7142602d821c0b494487b Author: Warner Losh AuthorDate: 2021-04-09 22:35:50 +0000 Commit: Warner Losh CommitDate: 2021-04-09 22:36:44 +0000 efivar: use bool for booleans Rather than int flags we ++, use booleans for all command line args. No functional change intended. Reviewed by: markj@ Sponsored by: Netflix, Inc Differential Revision: https://reviews.freebsd.org/D29621 --- usr.sbin/efivar/efivar.c | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/usr.sbin/efivar/efivar.c b/usr.sbin/efivar/efivar.c index 2fdf0e4d09b8..eb9a6e0257c8 100644 --- a/usr.sbin/efivar/efivar.c +++ b/usr.sbin/efivar/efivar.c @@ -70,9 +70,8 @@ static struct option longopts[] = { }; -static int aflag, Aflag, bflag, dflag, Dflag, gflag, Hflag, Nflag, - lflag, Lflag, Rflag, wflag, pflag, uflag, load_opt_flag; -static bool quiet; +static bool aflag, Aflag, bflag, dflag, Dflag, gflag, Hflag, Nflag, + lflag, Lflag, Rflag, wflag, pflag, uflag, load_opt_flag, quiet; static char *varname; static char *fromfile; static u_long attrib = EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS; @@ -316,58 +315,58 @@ parse_args(int argc, char **argv) longopts, NULL)) != -1) { switch (ch) { case 'a': - aflag++; + aflag = true; break; case 'A': - Aflag++; + Aflag = true; break; case 'b': - bflag++; + bflag = true; break; case 'd': - dflag++; + dflag = true; break; case 'D': - Dflag++; + Dflag = true; break; case 'g': - gflag++; + gflag = true; break; case 'H': - Hflag++; + Hflag = true; break; case 'l': - lflag++; + lflag = true; break; case 'L': - Lflag++; + Lflag = true; break; case 'n': varname = optarg; break; case 'N': - Nflag++; + Nflag = true; break; case 'O': - load_opt_flag++; + load_opt_flag = true; break; case 'p': - pflag++; + pflag = true; break; case 'q': quiet = true; break; case 'R': - Rflag++; + Rflag = true; break; case 't': attrib = strtoul(optarg, NULL, 16); break; case 'u': - uflag++; + uflag = true; break; case 'w': - wflag++; + wflag = true; break; case 'f': free(fromfile); @@ -386,13 +385,13 @@ parse_args(int argc, char **argv) if (argc == 1) varname = argv[0]; - if (aflag + Dflag + wflag > 1) { + if ((int)aflag + (int)Dflag + (int)wflag > 1) { warnx("Can only use one of -a (--append), " "-D (--delete) and -w (--write)"); usage(); } - if (aflag + Dflag + wflag > 0 && varname == NULL) { + if ((int)aflag + (int)Dflag + (int)wflag > 0 && varname == NULL) { warnx("Must specify a variable for -a (--append), " "-D (--delete) or -w (--write)"); usage(); @@ -407,13 +406,13 @@ parse_args(int argc, char **argv) else if (Lflag) print_known_guid(); else if (fromfile) { - Nflag = 1; + Nflag = true; print_var(NULL, NULL); } else if (varname) { - pflag++; + pflag = true; print_variable(varname); } else if (argc > 0) { - pflag++; + pflag = true; for (i = 0; i < argc; i++) print_variable(argv[i]); } else