From nobody Mon Jul 13 20:24:47 2026 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 4gzYnq5QDMz6ll38 for ; Mon, 13 Jul 2026 20:24:47 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gzYnq2YtKz3ZvN for ; Mon, 13 Jul 2026 20:24:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783974287; 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=3rcHqpnYIqjcCLHxeizP2DVmGS9HMBYW1/8HP5hAYsc=; b=h6P6+Wwh5Ci+/RvM+35JimDuux1GTZpc3CpbVslkhxKwvvPyo68hErKAMBxdmllnTOEv2/ J8TPrSgfOY1f9YzfUmBkQtwCZg/dNLlNUJuiqMaX327a4s2OpC2r5RVPppTBg3MRaZF6bW 792pmPvJNz3VStD4qL+eJ1R3LapQQUFCCL0bmHvhTlhivtNIJf6Wlw1uCAFPu2bjVrVDoZ juiZHeTs01AVIOIdRjo+w5Nrv1LsyUnbG0nw0vbgLJh0YF4nLW5QUYhn07ayElKFyWwRcI vhqzEA+Pp4QK2CcYBJ+8FYct0gTLJsWYnwIyieiXWRw0WJBNm474Zg9XRLqtDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783974287; a=rsa-sha256; cv=none; b=csZzNf9q6c712P0d3XcA8j+Y91GeriuSw0P5zAYz+kNR/3zJ25OwchCz6iLOPQSxb5Tfdi oKQJWtGHJDH2fno+2mwaEgmRVzkSPmmVmL4TvWeJu1b/tCY4c5ZwT7AKMj+2sNUoLPPS4N gO29mbi+uL6FKD3uxgjxTbFp6LRn19lcv8TKQrMj1dFwaI/QF1tJbr2T50uoQoEHx+Ham1 ReoAxdJYovMwLCx4TRbkPdWm4oqKkTgWsQARIZZdcONux3x9w6crY4hBBKWdvSOfA9I6Pm k+2DuitUPb+Xx0pMIkSyB85B6HreiCsJ/Jhe/tHYkDZutSWxCYTPt9piEQX4Hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783974287; 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=3rcHqpnYIqjcCLHxeizP2DVmGS9HMBYW1/8HP5hAYsc=; b=CJsuyNFVMBMmtRAn49D2CJPZs9DBsEfeLniK9IEcYnwTzGpblLgNtiwbSFM40BDiUrnJ3u Orn9KxBgGZKDH+19Rr3ZkoxsiPKDDmAtRcmBB3BQK7eXVVMmEuurwIXRW90O56QPnyiCSn nIuHuuCFNwFI7LpA2o0TuRcKzp5xDgItiWXTsz9ovB8q1ALEW1QIbk9VFBbypmNz/sfYi+ 4dvwO4dWgQq9NwSEAZHK5bJO2oWtMHzbUUZA/8zF5a+t5irW+3GU1nFQjTbzrEwRm4byfF TW3V6yD6fPEQbpbjYseqmmIyF1FHpMxsfGhbSQw+upTFe8QUgAwBfDYDiMjkTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gzYnq10H0z1CSq for ; Mon, 13 Jul 2026 20:24:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3882d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Jul 2026 20:24:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e49fc64b9b00 - main - loader: Fix indentation mistakes 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: e49fc64b9b0044d99524d7fd1d9de47f6cf873eb Auto-Submitted: auto-generated Date: Mon, 13 Jul 2026 20:24:47 +0000 Message-Id: <6a55498f.3882d.5b114b64@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e49fc64b9b0044d99524d7fd1d9de47f6cf873eb commit e49fc64b9b0044d99524d7fd1d9de47f6cf873eb Author: Warner Losh AuthorDate: 2026-07-13 20:22:57 +0000 Commit: Warner Losh CommitDate: 2026-07-13 20:23:31 +0000 loader: Fix indentation mistakes Somehow, I wound up with space indents rather than tab indents, so fix this. Sponsored by: Netflix --- stand/efi/loader/decompress.c | 90 +++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/stand/efi/loader/decompress.c b/stand/efi/loader/decompress.c index fb3c6314e4b6..e10daaa423ad 100644 --- a/stand/efi/loader/decompress.c +++ b/stand/efi/loader/decompress.c @@ -136,10 +136,10 @@ zlib_init(decomp_state *dctx, uint8_t *first_buf, size_t buflen, size_t size_hin EFI_STATUS status = alloc_buffer(dctx, dctx->size); if (EFI_ERROR(status)) return (status); - memset(strm, 0, sizeof(*strm)); - strm->next_in = first_buf; - strm->avail_in = buflen; - return (inflateInit2(strm, 15 + 16) == Z_OK ? EFI_SUCCESS : EFI_VOLUME_CORRUPTED); + memset(strm, 0, sizeof(*strm)); + strm->next_in = first_buf; + strm->avail_in = buflen; + return (inflateInit2(strm, 15 + 16) == Z_OK ? EFI_SUCCESS : EFI_VOLUME_CORRUPTED); } static enum step_return @@ -148,19 +148,19 @@ zlib_step(decomp_state *dctx, uint8_t *buf, size_t len, size_t offset) z_stream *strm = &dctx->zstrm; size_t outlen = dctx->buf_end - dctx->buf_cur; - strm->next_in = buf; - strm->avail_in = len; - strm->next_out = dctx->buf_cur; - strm->avail_out = outlen; + strm->next_in = buf; + strm->avail_in = len; + strm->next_out = dctx->buf_cur; + strm->avail_out = outlen; - int ret = inflate(strm, Z_NO_FLUSH); + int ret = inflate(strm, Z_NO_FLUSH); dctx->buf_cur += outlen - strm->avail_out; - if (ret == Z_STREAM_END) - return (done); - if (ret != Z_OK) - return (err); - if (dctx->buf_cur < dctx->buf_end) /* Have output space */ + if (ret == Z_STREAM_END) + return (done); + if (ret != Z_OK) + return (err); + if (dctx->buf_cur < dctx->buf_end) /* Have output space */ return (ok); /* @@ -200,10 +200,10 @@ bzip2_init(decomp_state *dctx, uint8_t *first_buf, size_t buflen, size_t size_hi EFI_STATUS status = alloc_buffer(dctx, dctx->size); if (EFI_ERROR(status)) return (status); - memset(strm, 0, sizeof(*strm)); - strm->next_in = first_buf; - strm->avail_in = buflen; - return (BZ2_bzDecompressInit(strm, 0, 0) == BZ_OK ? EFI_SUCCESS : EFI_VOLUME_CORRUPTED); + memset(strm, 0, sizeof(*strm)); + strm->next_in = first_buf; + strm->avail_in = buflen; + return (BZ2_bzDecompressInit(strm, 0, 0) == BZ_OK ? EFI_SUCCESS : EFI_VOLUME_CORRUPTED); } static enum step_return @@ -212,19 +212,19 @@ bzip2_step(decomp_state *dctx, uint8_t *buf, size_t len, size_t offset) bz_stream *strm = &dctx->bzstrm; size_t outlen = dctx->buf_end - dctx->buf_cur; - strm->next_in = buf; - strm->avail_in = len; - strm->next_out = dctx->buf_cur; - strm->avail_out = outlen; + strm->next_in = buf; + strm->avail_in = len; + strm->next_out = dctx->buf_cur; + strm->avail_out = outlen; - int ret = BZ2_bzDecompress(strm); + int ret = BZ2_bzDecompress(strm); dctx->buf_cur += outlen - strm->avail_out; - if (ret == BZ_STREAM_END) - return (done); - if (ret != BZ_OK) - return (err); - if (dctx->buf_cur < dctx->buf_end) /* Have output space */ + if (ret == BZ_STREAM_END) + return (done); + if (ret != BZ_OK) + return (err); + if (dctx->buf_cur < dctx->buf_end) /* Have output space */ return (ok); /* @@ -265,7 +265,7 @@ xz_init(decomp_state *dctx, uint8_t *first_buf, size_t buflen, size_t size_hint) xz_crc32_init(); xz_crc64_init(); dctx->xzstrm = xz_dec_init(XZ_DYNALLOC, (uint32_t)-1); - return (dctx->xzstrm != NULL ? EFI_SUCCESS : EFI_VOLUME_CORRUPTED); + return (dctx->xzstrm != NULL ? EFI_SUCCESS : EFI_VOLUME_CORRUPTED); } @@ -278,12 +278,12 @@ xz_step(decomp_state *dctx, uint8_t *buf, size_t len, size_t offset) .out = dctx->buf_cur, .out_size = outlen, .out_pos = 0 }; int ret; - ret = xz_dec_run(strm, &b); + ret = xz_dec_run(strm, &b); dctx->buf_cur += b.out_pos; - if (ret == XZ_STREAM_END) - return (done); - if (ret != XZ_OK) { + if (ret == XZ_STREAM_END) + return (done); + if (ret != XZ_OK) { switch(ret) { case XZ_MEM_ERROR: printf("xz no memory "); @@ -305,9 +305,9 @@ xz_step(decomp_state *dctx, uint8_t *buf, size_t len, size_t offset) break; } printf(" len %d offset %d\n", (int)len, (int)offset); - return (err); + return (err); } - if (dctx->buf_cur < dctx->buf_end) /* Have output space */ + if (dctx->buf_cur < dctx->buf_end) /* Have output space */ return (ok); /* @@ -351,13 +351,13 @@ zstd_init(decomp_state *dctx, uint8_t *first_buf, size_t buflen, size_t size_hin if (EFI_ERROR(status)) return (status); - dctx->zstdstrm = ZSTD_createDStream(); - if (dctx->zstdstrm == NULL) - return (EFI_OUT_OF_RESOURCES); - if (ZSTD_isError(ZSTD_initDStream(dctx->zstdstrm))) { + dctx->zstdstrm = ZSTD_createDStream(); + if (dctx->zstdstrm == NULL) + return (EFI_OUT_OF_RESOURCES); + if (ZSTD_isError(ZSTD_initDStream(dctx->zstdstrm))) { ZSTD_freeDStream(dctx->zstdstrm); dctx->zstdstrm = NULL; - return (EFI_OUT_OF_RESOURCES); + return (EFI_OUT_OF_RESOURCES); } return (EFI_SUCCESS); } @@ -373,11 +373,11 @@ zstd_step(decomp_state *dctx, uint8_t *buf, size_t len, size_t offset) ret = ZSTD_decompressStream(dctx->zstdstrm, &outbuf, &inbuf); dctx->buf_cur += outbuf.pos; - if (ZSTD_isError(ret)) - return (err); - if (ret == 0) - return (done); - if (dctx->buf_cur < dctx->buf_end) /* Have output space */ + if (ZSTD_isError(ret)) + return (err); + if (ret == 0) + return (done); + if (dctx->buf_cur < dctx->buf_end) /* Have output space */ return (ok); /*