From 87662ab391b8efe077a9f50a040e6a1a5035e55b Mon Sep 17 00:00:00 2001 From: Rui Paulo Date: Fri, 5 Sep 2008 18:09:49 +0000 Subject: [PATCH] Keep entries sorted. --- sys/geom/part/g_part.c | 2 +- sys/geom/part/g_part.h | 2 +- sys/geom/part/g_part_gpt.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c index c184bc8caa66..d4cd69f81062 100644 --- a/sys/geom/part/g_part.c +++ b/sys/geom/part/g_part.c @@ -65,6 +65,7 @@ struct g_part_alias_list { const char *lexeme; enum g_part_alias alias; } g_part_alias_list[G_PART_ALIAS_COUNT] = { + { "apple-hfs", G_PART_ALIAS_APPLE_HFS } { "efi", G_PART_ALIAS_EFI }, { "freebsd", G_PART_ALIAS_FREEBSD }, { "freebsd-boot", G_PART_ALIAS_FREEBSD_BOOT }, @@ -73,7 +74,6 @@ struct g_part_alias_list { { "freebsd-vinum", G_PART_ALIAS_FREEBSD_VINUM }, { "freebsd-zfs", G_PART_ALIAS_FREEBSD_ZFS }, { "mbr", G_PART_ALIAS_MBR }, - { "apple-hfs", G_PART_ALIAS_APPLE_HFS } }; /* diff --git a/sys/geom/part/g_part.h b/sys/geom/part/g_part.h index 8560845ddf5c..cfc048dfd655 100644 --- a/sys/geom/part/g_part.h +++ b/sys/geom/part/g_part.h @@ -36,6 +36,7 @@ #define G_PART_PROBE_PRI_HIGH 0 enum g_part_alias { + G_PART_ALIAS_APPLE_HFS, /* An HFS file system entry. */ G_PART_ALIAS_EFI, /* A EFI system partition entry. */ G_PART_ALIAS_FREEBSD, /* A BSD labeled partition entry. */ G_PART_ALIAS_FREEBSD_BOOT, /* A FreeBSD boot partition entry. */ @@ -44,7 +45,6 @@ enum g_part_alias { G_PART_ALIAS_FREEBSD_VINUM, /* A Vinum partition entry. */ G_PART_ALIAS_FREEBSD_ZFS, /* A ZFS file system entry. */ G_PART_ALIAS_MBR, /* A MBR (extended) partition entry. */ - G_PART_ALIAS_APPLE_HFS, /* An HFS file system entry. */ /* Keep the following last */ G_PART_ALIAS_COUNT }; diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c index 3a3179d0fe76..77d018b414f7 100644 --- a/sys/geom/part/g_part_gpt.c +++ b/sys/geom/part/g_part_gpt.c @@ -131,6 +131,7 @@ static struct g_part_scheme g_part_gpt_scheme = { }; G_PART_SCHEME_DECLARE(g_part_gpt); +static struct uuid gpt_uuid_apple_hfs = GPT_ENT_TYPE_APPLE_HFS; static struct uuid gpt_uuid_efi = GPT_ENT_TYPE_EFI; static struct uuid gpt_uuid_freebsd = GPT_ENT_TYPE_FREEBSD; static struct uuid gpt_uuid_freebsd_boot = GPT_ENT_TYPE_FREEBSD_BOOT; @@ -140,7 +141,6 @@ static struct uuid gpt_uuid_freebsd_vinum = GPT_ENT_TYPE_FREEBSD_VINUM; static struct uuid gpt_uuid_freebsd_zfs = GPT_ENT_TYPE_FREEBSD_ZFS; static struct uuid gpt_uuid_linux_swap = GPT_ENT_TYPE_LINUX_SWAP; static struct uuid gpt_uuid_mbr = GPT_ENT_TYPE_MBR; -static struct uuid gpt_uuid_apple_hfs = GPT_ENT_TYPE_APPLE_HFS; static struct uuid gpt_uuid_unused = GPT_ENT_TYPE_UNUSED; static void