From nobody Sun Aug 21 15:49:10 2022 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 4M9g064jksz4Z6BM; Sun, 21 Aug 2022 15:49:10 +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 4M9g064Dszz3Byt; Sun, 21 Aug 2022 15:49:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661096950; 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=sS4zOdVwPTnfYQQsZVOzlSU0LzZLpeDUjxysRvvyFT4=; b=qZu7XxQ/OXW2PW0QlY+ITAT+YhaUFvwDRwx03/WFWREnJJOrRMwJjmIfCDcFGOyiaCYqom seLY+jBCxuQkZSE/GKoSXVi7aYQVQCmSqazqeurVwd0vbOt/gPVT/jbor3ea8WYby5sG+7 55/avJybKw/kVmnKjYbwMghiZpvyphsHskcyaMCjjm615jJFMS9R07xHrVzVYbWmeNXZ2x 0Dl2CwpGmmTFs5l2NaTgjCil/d/Ke4U2VcLQsXBLldDuSN8rifsMHZKo2cdcN/eG1OD6Ol dMLzxuojRggiz1hp5ht8DSWqnpZ7kb8uQPThq0BIT2HgAYd9QMsf2B4bQ+cP8Q== 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 4M9g0637MgzGJB; Sun, 21 Aug 2022 15:49:10 +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 27LFnAN3070082; Sun, 21 Aug 2022 15:49:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27LFnAiQ070081; Sun, 21 Aug 2022 15:49:10 GMT (envelope-from git) Date: Sun, 21 Aug 2022 15:49:10 GMT Message-Id: <202208211549.27LFnAiQ070081@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: 9d70108a74ef - main - stand: Use bool for stage_offset_set 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: 9d70108a74efe327ed9d1f68bc1e9e271810d94c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661096950; 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=sS4zOdVwPTnfYQQsZVOzlSU0LzZLpeDUjxysRvvyFT4=; b=VBZBl8tlvlfam+ymc9NKCvmpxYGiCUMidk9Nxdc0CZ9VTATSht6fWd+uY80OGr/awc1B1i H7oW0Oto5kurKTSd1hUCETQYBwQPCUJIJ8bY7tpx0LwS4G35UVEUKqNH4QOy67xl54emSH JAJFFLj0A5OlmhvVNgUfhEqiw/7MfnqspQSuwy4zrFWMKg6OU4sbwBK7px4YxLIeOto4cN ah4nPlAoxCA/PSJMue1jAFPjaIpgqQufrELgaP6VyM6Kd/M7Dg92+5kpDbqQL7WsG5U+fE f1sWwmSokypE3e7ToPWMkSa24IxeddsDoWmLFTLuTd4xD5E5nGo00YtehZ8EVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661096950; a=rsa-sha256; cv=none; b=AYatNqPTenMjWLguo9jR/QnQK0OhBFra9L105LIKeCaFQ9C5ROFLiN+45MKkeJ9n1w23QW xlhH0ZdMx48qWPRJ5pkcb05KayIFOkQclyqRPZ6AdUt4cXyStaGm1XtPE3PHZlpjWcgVbj x/l3CLbwu7oShZD+UR0rqou2wnn7zKmMF+EErJA/nKqJMyKoDUp3fbOQjX72X3KL+akiWj Du2g77nDj8UCJGQgRpdWIHMzwoUX0GeED1SG6ainMpMc8EqDeGL9wGTauq897bTU2vcnQo N/ERDWyBLeV45dTWpGm4QGSJ5uY0oKlPC6AIkeUWaVXKMt4bTRNEFw1MBkadMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9d70108a74efe327ed9d1f68bc1e9e271810d94c commit 9d70108a74efe327ed9d1f68bc1e9e271810d94c Author: Warner Losh AuthorDate: 2022-08-21 15:45:44 +0000 Commit: Warner Losh CommitDate: 2022-08-21 15:48:02 +0000 stand: Use bool for stage_offset_set stage_offset_set is a boolean, convert it to a bool. Sponsored by: Netflix --- stand/efi/loader/copy.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stand/efi/loader/copy.c b/stand/efi/loader/copy.c index 78159dfff4e3..5892a790550b 100644 --- a/stand/efi/loader/copy.c +++ b/stand/efi/loader/copy.c @@ -200,7 +200,7 @@ out: static u_long staging_slop = EFI_STAGING_SLOP; EFI_PHYSICAL_ADDRESS staging, staging_end, staging_base; -int stage_offset_set = 0; +bool stage_offset_set = false; ssize_t stage_offset; static void @@ -208,7 +208,7 @@ efi_copy_free(void) { BS->FreePages(staging_base, (staging_end - staging_base) / EFI_PAGE_SIZE); - stage_offset_set = 0; + stage_offset_set = false; stage_offset = 0; } @@ -478,7 +478,7 @@ efi_copyin(const void *src, vm_offset_t dest, const size_t len) if (!stage_offset_set) { stage_offset = (vm_offset_t)staging - dest; - stage_offset_set = 1; + stage_offset_set = true; } /* XXX: Callers do not check for failure. */ @@ -509,7 +509,7 @@ efi_readin(readin_handle_t fd, vm_offset_t dest, const size_t len) if (!stage_offset_set) { stage_offset = (vm_offset_t)staging - dest; - stage_offset_set = 1; + stage_offset_set = true; } if (!efi_check_space(dest + stage_offset + len)) {