From nobody Mon Jan 09 17:17:15 2023 X-Original-To: dev-commits-src-main@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 4NrLGg4HJzz2p584; Mon, 9 Jan 2023 17:17:15 +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 4NrLGg3pYzz4CXP; Mon, 9 Jan 2023 17:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673284635; 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=LVyo672vsnx4LvZX7CQ9FEHSlLI3+kjFGTfRJVUzQ1g=; b=pHF064j+O6q6eBEcXoZCBE3CBZgTB0OaW88iqViYqO9IvavOxR+ZXtBcTkqbPSjzZIAceP 1Wl8jOvLPGdqhqcKdqRClUKnuVHkUPxNxc6CoOU9EbqUm83YCRYqvCscHp8JfS8tkFtdVr nAokQxesZ2dFBgtlvcPhkulio0W0Y3EiBcrL/T3rF0ECHogd8liAlpyEVeT+bc1WFPRQYG Cabve2HAapQx9tTMm76ChGAwD9HvUhFktIfZI5SX7CWwVrEudV1G6Wu+XmWhTniSW+sonH H1cSy+qIs7f5RttWq+/+4zX2MvTy7QtpNiy+hbQSpxCR83TD4X8tbCSjy8lm7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673284635; 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=LVyo672vsnx4LvZX7CQ9FEHSlLI3+kjFGTfRJVUzQ1g=; b=QS4pjIrDwq20/Yg2pnGkHchLy8YRoAEd3NELxfxlrtgzvtrCNTNDL8zc8Yh5hlzaU0Ij4X 4mjD/Z9XKH20aLJA1BiY6r73JLQPoRAmvm+ELZP9/4aoD66XCmUZgC9tvpMis3bDywpcca LoK5lPX6rIE/5IVHVT6cc6KeYu5wKlCs0czwzokHtyZPfwVvQMCBRbjiRA40SP2l07MQWK LABCyOxfHkHkXvXs122EftSM4Y0tCdu89GfuBFRAHzhOdLn0iWchDJl6RmIqVmX+RJgSu4 fpmluw0BjlTKIZq//S7DSaSCGdL5NsN/cuPCwJj8CuKaU88rkjrdrIT+r6YAZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673284635; a=rsa-sha256; cv=none; b=UkXmj2HXNQQJVtqt+IGPG6P7FqNVSY/lZ4ru0wzWNxR+fzGkNW6zsOJYtFykPYWmHOdfs/ wjk9MeYAFvuI9KJ55pJTVheapuC7rIRPautI3IcaqdKrccOkrmXg7fNxiD3AnvewI+9Gnb qGdz7hQZK+UKhLPmklf0OC/dMAc0BwqW4/cNo1221W53iGhcwA4LJ0cykgsvR0O19aj21T ISTQXu0cGsl0WCke0b6f6iOFHbjSzpxIPSY2TM/hNv2QpTW8nG9vWuzicg44XJx25NpaGr czEj2Ufra9zRznZIlFNy2V5l7ZtMQPYxb0J/g/YTAg75SlDdjekMv3foHPVHsg== 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 4NrLGg2sBzzbxH; Mon, 9 Jan 2023 17:17:15 +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 309HHFe9023579; Mon, 9 Jan 2023 17:17:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 309HHFI0023578; Mon, 9 Jan 2023 17:17:15 GMT (envelope-from git) Date: Mon, 9 Jan 2023 17:17:15 GMT Message-Id: <202301091717.309HHFI0023578@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: 23ed2a38c200 - main - stand/efi: Better variable name List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org 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: 23ed2a38c200c93414de20d20f7508f621acecd1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=23ed2a38c200c93414de20d20f7508f621acecd1 commit 23ed2a38c200c93414de20d20f7508f621acecd1 Author: Warner Losh AuthorDate: 2023-01-08 19:00:51 +0000 Commit: Warner Losh CommitDate: 2023-01-09 17:12:40 +0000 stand/efi: Better variable name sanity_check_currdev returns true if it found a kernel or a sane loader config file. A better name for this would be 'bootable' rather than 'rv' which connotes in other places an errno value or similar. Sponsored by: Netflix --- stand/efi/loader/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 57a9769f6024..a315fdea8edc 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -267,7 +267,7 @@ probe_zfs_currdev(uint64_t guid) char *devname; struct zfs_devdesc currdev; char *buf = NULL; - bool rv; + bool bootable; currdev.dd.d_dev = &zfs_dev; currdev.dd.d_unit = 0; @@ -277,8 +277,8 @@ probe_zfs_currdev(uint64_t guid) devname = devformat(&currdev.dd); init_zfs_boot_options(devname); - rv = sanity_check_currdev(); - if (rv) { + bootable = sanity_check_currdev(); + if (bootable) { buf = malloc(VDEV_PAD_SIZE); if (buf != NULL) { if (zfs_get_bootonce(&currdev, OS_BOOTONCE, buf, @@ -291,7 +291,7 @@ probe_zfs_currdev(uint64_t guid) (void) zfs_attach_nvstore(&currdev); } } - return (rv); + return (bootable); } #endif