From nobody Thu Mar 30 15:45:30 2023 X-Original-To: dev-commits-src-all@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 4PnSRt6ZWBz41xGM; Thu, 30 Mar 2023 15:45:30 +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 4PnSRt6BWgz4GDb; Thu, 30 Mar 2023 15:45:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680191130; 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=WE2BUCRche+2J8VHjRWmtqY5EDM2EQ5bIbop+3mP+f0=; b=GXOnhVQSnpWGRizgJ9egxRnaFLD5OtcJ43I7YzLgM56JCsfTBn/UoQyDBtBQ86JCJpAAPU 8vq+lCnRLUjeGJKgSfEau3wc7/34HkHOzsgbDSpqfhspqcE7zk1b+vmh9xAQbjBgnN0m9Y /y7tXFIOrV9TFpyYJJIoLduG0mwXAKd9zu5bAaz8PHvbZEovILWU2i07MqNH9LY1tfQ8Oy Sk0ihfdTrAknAbOt6oIXAx1vNSA11klPmxy0uJeklC7KKdWlaus3zraWyNdfoXuDyLBUji Wf6EdJD9bw8IpVjxPsqheUYDKs3R4jVkoY1Wu8VCD5rDm/GhIKaakszk9g3cOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680191130; 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=WE2BUCRche+2J8VHjRWmtqY5EDM2EQ5bIbop+3mP+f0=; b=BZRSz6V26t+rYH+EijwSjnyMVhr/XWBSxNbkp7e4soMluL6ODCcd7aVB+6aq2GhxRe9bu5 RvLt/z8ohOo1FUdlefdhxPKr7+TIYJj/q/GI2jh4a6KlqjwtCQCjbYEJbWjya4XHcc5Y6n HF28EtfTQ5xylPb1c48GzdlhMSod50FxPbhZ+zlujb+P22W5P4H7xi6wUS8e2tGlIZ3KWr PpTQRy9OUo6CKf88R2RZNuAOFJAS2QSS3tuNCS+tlNvkpkgP4UL0f2L1Q/2sFylfS0ID1t DrnZIVvi4gxcfdtPzuZPzUnFuoU0rg+hxgn8KLcV1Vx0c9MGZl5M+YE9fLm8AQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680191130; a=rsa-sha256; cv=none; b=We0zl2PTAb2BCmwaQy3gvt2PPonCUiWoCojXFuy9DoBdRXHvks/EOqVXUPnPezBmt3MmHa htcBfY8Jbo3yUR00kF35BLsSg9n/M6AYvVCH6e3dqDH1VVglBETiZ3U2fsDkRfWFJOtVnE /WgoIKLS78fgheGlGXD7jaKgh+q48Tyzd4E6NftaUvd0RI4jiBfwZGqLKHIR6TVpGIhisa tfiPvu6X4PxQZ7xwAozW9Op9qGFdJG0LCLdRsSdeQdoFuVsmjY24jqYBReaZ47cSIQLbwj Ek+lRfDwdKhRzgKeeok32VtcaU70N8t9M7KVnakDMSmIY1ZPOGKLDqoWb2k+dA== 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 4PnSRt5GfJzJ6D; Thu, 30 Mar 2023 15:45:30 +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 32UFjUsT094286; Thu, 30 Mar 2023 15:45:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UFjUZe094285; Thu, 30 Mar 2023 15:45:30 GMT (envelope-from git) Date: Thu, 30 Mar 2023 15:45:30 GMT Message-Id: <202303301545.32UFjUZe094285@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 52c68e1625e4 - main - makefs: Whitespace cleanup to sync with NetBSD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 52c68e1625e418e384b6d2d118a22bc3e4529f64 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=52c68e1625e418e384b6d2d118a22bc3e4529f64 commit 52c68e1625e418e384b6d2d118a22bc3e4529f64 Author: Ed Maste AuthorDate: 2023-03-30 14:31:14 +0000 Commit: Ed Maste CommitDate: 2023-03-30 15:45:13 +0000 makefs: Whitespace cleanup to sync with NetBSD --- 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++; }