Skip to content

Commit 3ccc0e1

Browse files
author
krw
committed
Rename subr_disk.c local LE GPT_UUID_* #define's to be
consistent with the BE *_GUID #define's used in fdisk/part.c.
1 parent 8cd1c8d commit 3ccc0e1

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

sys/kern/subr_disk.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $OpenBSD: subr_disk.c,v 1.277 2025/08/01 09:18:30 krw Exp $ */
1+
/* $OpenBSD: subr_disk.c,v 1.278 2025/08/02 07:02:00 krw Exp $ */
22
/* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */
33

44
/*
@@ -546,16 +546,16 @@ gpt_get_parts(struct buf *bp, void (*strat)(struct buf *), struct disklabel *lp,
546546
#define GPT_UUID_UNUSED \
547547
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
548548
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
549-
#define GPT_UUID_MSDOS \
549+
#define GPT_UUID_MICROSOFT_BASIC_DATA \
550550
{ 0xa2, 0xa0, 0xd0, 0xeb, 0xe5, 0xb9, 0x33, 0x44, \
551551
0x87, 0xc0, 0x68, 0xb6, 0xb7, 0x26, 0x99, 0xc7 }
552-
#define GPT_UUID_CHROMEROOTFS \
552+
#define GPT_UUID_CHROMEOS_ROOTFS \
553553
{ 0x02, 0xe2, 0xb8, 0x3c, 0x7e, 0x3b, 0xdd, 0x47, \
554554
0x8a, 0x3c, 0x7f, 0xf2, 0xa1, 0x3c, 0xfc, 0xec }
555-
#define GPT_UUID_LINUX \
555+
#define GPT_UUID_LINUX_FILES \
556556
{ 0xaf, 0x3d, 0xc6, 0x0f, 0x83, 0x84, 0x72, 0x47, \
557557
0x8e, 0x79, 0x3d, 0x69, 0xd8, 0x47, 0x7d, 0xe4 }
558-
#define GPT_UUID_APPLE_HFS \
558+
#define GPT_UUID_MAC_OS_X_HFS \
559559
{ 0x00, 0x53, 0x46, 0x48, 0x00, 0x00, 0xaa, 0x11,\
560560
0xaa, 0x11, 0x00, 0x30, 0x65, 0x43, 0xec, 0xac }
561561
#define GPT_UUID_BIOS_BOOT \
@@ -578,14 +578,14 @@ gpt_get_fstype(const struct uuid *uuid_part)
578578
uint8_t gptype[16];
579579
int fstype;
580580
} knownfs[] = {
581-
{ GPT_UUID_UNUSED, FS_UNUSED },
582-
{ GPT_LEUUID_OPENBSD, FS_BSDFFS },
583-
{ GPT_UUID_MSDOS, FS_MSDOS },
584-
{ GPT_UUID_CHROMEROOTFS,FS_EXT2FS },
585-
{ GPT_UUID_LINUX, FS_EXT2FS },
586-
{ GPT_UUID_APPLE_HFS, FS_HFS },
587-
{ GPT_LEUUID_EFI_SYSTEM,FS_MSDOS },
588-
{ GPT_UUID_BIOS_BOOT, FS_BOOT }
581+
{ GPT_UUID_UNUSED, FS_UNUSED },
582+
{ GPT_LEUUID_OPENBSD, FS_BSDFFS },
583+
{ GPT_UUID_MICROSOFT_BASIC_DATA,FS_MSDOS },
584+
{ GPT_UUID_CHROMEOS_ROOTFS, FS_EXT2FS },
585+
{ GPT_UUID_LINUX_FILES, FS_EXT2FS },
586+
{ GPT_UUID_MAC_OS_X_HFS, FS_HFS },
587+
{ GPT_LEUUID_EFI_SYSTEM, FS_MSDOS },
588+
{ GPT_UUID_BIOS_BOOT, FS_BOOT }
589589
};
590590

591591
for (i = 0; i < nitems(knownfs); i++) {

0 commit comments

Comments
 (0)