From nobody Fri Apr 14 12:52:48 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 4Pybvj1jRSz45Bcb; Fri, 14 Apr 2023 12:52:49 +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 4Pybvj0gT7z3rcd; Fri, 14 Apr 2023 12:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681476769; 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=4m8bfFdGzpNdSfwSYmgBvoaUKWnd8cKFrqZoramOIek=; b=gdtsAKo5Jym80T9kbCSzEkuA6+dgYB7l7TJsYp9Pe4f2Fh+7EykztYS6q0aP6PiAxiTMsy HcB/B1oepSHmb2P/Jlmn7K0J4+PBxgRLlvz8TfkSr5+CbK/PofBYAxpRdKxIJv3wbjC+HG /RQVW86+9Q+qPM7RtzG78Ryn094LNBbRmSDGEPE16I1BAfLojVXPdHeQpH5Vl51FSfx3wG dz1lScN8pHgmNb71Mh/I3wWiiMpates1EKRhw+Htyv/CIcTo58NV0ldJqmMn9ATP0v+tIL IbXWesJ3NfX1ZjJf8sdVMmhM/Ihjw9Tyr27C9Hkw33Ku4ZR7TxZbNpQIQhbTyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681476769; 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=4m8bfFdGzpNdSfwSYmgBvoaUKWnd8cKFrqZoramOIek=; b=Y5lsHKwB4P0HE48Ltz1amZj1RRLg6qsL8nlQ4WohZGXlqpmCnMdYA6+wecUaJA3kkGxis3 QgogLQWrQoipZj79RbbVI9gUjIOItzM0MgWGTAFhPGpgSYhBglRUCx0NNbrrxmOeYAFy/B bdYP/5suEcJI0CS7xDWVY4/dABbGPew9qODOQOZ8Gh4UXzHVap0JZX6vVf6rjab/17zNN7 f9MypI4eSk9+hFXQOxbGWqHf/XLYz31mF0IvQGwuLJ3NAA8KqLzsAutwYSvutWKms5QnL0 DocF1xoRuhj3wochYopj/xJKZ/N3X/ton/QK5P6WKuxQWt0x6IZSPDMMB11SNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681476769; a=rsa-sha256; cv=none; b=ucBsqH/f69nj4zHaPrpOI4qAk5zwYRhOxg9mgnBUC/8eqT7vBmly8A+CtIJz/imdSUT1MK V0J7cHh6k+YyQNTy7Zx4xLmWwVUCaRBo49wmkl6Pn62uDnS1UGkANZB8M511LJifMd6NZ0 Kgecu6LZjwC5ikMJacO43ewn0ZSmSsi9/dfdDp8QJUPM2kQwErJYNDZo7K1YKmXAhkgjIK hfmSgqNwFjqLu6eZSCRvzbjx4j+9AQ46qKbKdp256gwBXbcCnNKjdqx9dx+a/XD5io7EWd IUuQQzT1MXt91xW6sdlrl8cygvWIzsoL2NR0PoWS0BmrOlstV1Dk3lVSDNYjBw== 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 4Pybvh6sh9zQ80; Fri, 14 Apr 2023 12:52:48 +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 33ECqmBc074746; Fri, 14 Apr 2023 12:52:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ECqm8g074745; Fri, 14 Apr 2023 12:52:48 GMT (envelope-from git) Date: Fri, 14 Apr 2023 12:52:48 GMT Message-Id: <202304141252.33ECqm8g074745@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 3dff74872029 - stable/13 - makefs: Whitespace cleanup to sync with NetBSD 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3dff74872029d2f6396935d8e52256288d991647 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3dff74872029d2f6396935d8e52256288d991647 commit 3dff74872029d2f6396935d8e52256288d991647 Author: Ed Maste AuthorDate: 2023-03-30 14:31:14 +0000 Commit: Ed Maste CommitDate: 2023-04-14 12:10:37 +0000 makefs: Whitespace cleanup to sync with NetBSD (cherry picked from commit 52c68e1625e418e384b6d2d118a22bc3e4529f64) --- usr.sbin/makefs/cd9660/cd9660_eltorito.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.c b/usr.sbin/makefs/cd9660/cd9660_eltorito.c index b60e63ee1b53..0a57c91a659e 100644 --- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c +++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c @@ -540,7 +540,7 @@ cd9660_write_mbr_partition_entry(FILE *fd, int idx, off_t sector_start, if (fseeko(fd, (off_t)(idx) * 16 + 0x1be, SEEK_SET) == -1) err(1, "fseeko"); - + val = 0x80; /* Bootable */ fwrite(&val, sizeof(val), 1, fd); @@ -610,7 +610,7 @@ cd9660_write_apm_partition_entry(FILE *fd, int idx, int total_partitions, apm32 = 0; /* pmLgDataStart */ fwrite(&apm32, sizeof(apm32), 1, fd); - /* pmDataCnt */ + /* pmDataCnt */ apm32 = htobe32(nsectors); fwrite(&apm32, sizeof(apm32), 1, fd); /* pmPartStatus */ @@ -659,9 +659,9 @@ cd9660_write_boot(iso9660_disk *diskStructure, FILE *fd) } cd9660_copy_file(diskStructure, fd, t->sector, t->filename); - if (t->system == ET_SYS_MAC) + if (t->system == ET_SYS_MAC) apm_partitions++; - if (t->system == ET_SYS_PPC) + if (t->system == ET_SYS_PPC) mbr_partitions++; }