From nobody Tue Jan 24 22:12:12 2023 X-Original-To: dev-commits-src-branches@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 4P1h6437Lhz3bfwq; Tue, 24 Jan 2023 22:12:12 +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 4P1h642hRBz3C40; Tue, 24 Jan 2023 22:12:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598332; 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=4Dwiz135n1HI7zInJmL1Lt9DfMoY82P5rYvVt9G4SOk=; b=wo3XAEr6tKGceAZDtFR2/JEA+yGGGQPXCxW34B3qirImM5cjGEA0TBVuaRAvjYu8QJSVLO O53CSKdj3uPOshggwfcycikF7CiVB4iXJg5GrezVyW8o0Pgg79KMQZ3sadHsKT+UXZKhOH qzE8eQhY1crOjkVSDQlN6WCUiVkdlSENfZWVelN8q10xkdAdmfFzjusn0jvIn+Y3VNQRxA If3Ze8GNoTSc95O67KYwBuHWeyJwake2LhpJZR4LSHWXQxtceLx5XHHDzmE9SUro9wyLtZ t+bDEnj6xZxsUSOJPC9qRIVKvccFg58Xn/FQYfDgSM6F8Jsd+pQOPW5dsGvdSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598332; 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=4Dwiz135n1HI7zInJmL1Lt9DfMoY82P5rYvVt9G4SOk=; b=yzyBJ7bhGzLVnzsad8Q+pgIMOZgKSAjiPVWbVglGv/hJ1hrYW2U713pOIbe+ROTiejMvmT dZ7dKdHzNj9Zh9u8xqQFFdaratw3pmDyap9E1OOy/fa89XHCCuCHk82R7MDI3Sgt14UbXu DAq+JyAuWxXbJCW9XdiIX5iRBc32bYZvLRiRULEaD+FJtPLVEpNs9MrP7TDg5zmdZhOUSP r6Gq+NwtvxD3EP/g8TGCIbzWUkSxkztFzFiFyq42v5fBsqhwntIrFKKgbJWZjeWzsh+veG 2rgrUbPyVlf/YPKYIOFbZZi7JLlv5vIDnjfJ6tMANq5MtjsyxDqMg2b2e16IIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598332; a=rsa-sha256; cv=none; b=al83svYTLW+lOa11Co6SmGifmHEWNCNraRtfWq+/GORz4pgKSY/cVJqntMC9pBxd03V5Ha xLgVDgeG2+aCfXBdiGYhYy0YA5NbD7qohx8GFb1MLwGrHdySAwm7zio+bMeVYxGR6AB744 sRkEwjxQ8NoME/ddRivGWNB0OztKn4kw9j76xx1hloQ6JT9U67JJN97XJnpfLLRr7MdnnP wlvDnI0Lsky32m7cFGtRUdWQYb7jij6ypbqLVYo8Guf8Se+8hqgBQdOCen2HuAV8wjxSqD t/178dz/IEwj831vWAX8cg4awcTtZ1BZ67MOLkGuwKRTRpKuyyS+VCqTh4AD6A== 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 4P1h641c4JzQPP; Tue, 24 Jan 2023 22:12:12 +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 30OMCCf0086698; Tue, 24 Jan 2023 22:12:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMCCtO086697; Tue, 24 Jan 2023 22:12:12 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:12:12 GMT Message-Id: <202301242212.30OMCCtO086697@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 39cfd1380a64 - stable/13 - stand: Use bool for stage_offset_set List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 39cfd1380a642d1c3d511847a890e59e9dbf4469 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=39cfd1380a642d1c3d511847a890e59e9dbf4469 commit 39cfd1380a642d1c3d511847a890e59e9dbf4469 Author: Warner Losh AuthorDate: 2022-08-21 15:45:44 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:32 +0000 stand: Use bool for stage_offset_set stage_offset_set is a boolean, convert it to a bool. Sponsored by: Netflix (cherry picked from commit 9d70108a74efe327ed9d1f68bc1e9e271810d94c) --- 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 980345b979f6..d7ca5513516b 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)) {