Module Name: src
Committed By: christos
Date: Tue Sep 30 02:12:55 UTC 2014
Modified Files:
src/sbin/gpt: add.c backup.c create.c gpt.c gpt.h label.c migrate.c
remove.c resize.c resizedisk.c restore.c set.c show.c type.c
unset.c
Log Message:
remove compat defines.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sbin/gpt/add.c
cvs rdiff -u -r1.6 -r1.7 src/sbin/gpt/backup.c
cvs rdiff -u -r1.8 -r1.9 src/sbin/gpt/create.c
cvs rdiff -u -r1.32 -r1.33 src/sbin/gpt/gpt.c
cvs rdiff -u -r1.14 -r1.15 src/sbin/gpt/gpt.h src/sbin/gpt/remove.c
cvs rdiff -u -r1.16 -r1.17 src/sbin/gpt/label.c
cvs rdiff -u -r1.17 -r1.18 src/sbin/gpt/migrate.c src/sbin/gpt/show.c
cvs rdiff -u -r1.9 -r1.10 src/sbin/gpt/resize.c
cvs rdiff -u -r1.3 -r1.4 src/sbin/gpt/resizedisk.c src/sbin/gpt/set.c \
src/sbin/gpt/type.c src/sbin/gpt/unset.c
cvs rdiff -u -r1.4 -r1.5 src/sbin/gpt/restore.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/add.c
diff -u src/sbin/gpt/add.c:1.25 src/sbin/gpt/add.c:1.26
--- src/sbin/gpt/add.c:1.25 Mon Sep 29 16:28:57 2014
+++ src/sbin/gpt/add.c Mon Sep 29 22:12:55 2014
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: add.c,v 1.25 2014/09/29 20:28:57 christos Exp $");
+__RCSID("$NetBSD: add.c,v 1.26 2014/09/30 02:12:55 christos Exp $");
#endif
#include <sys/types.h>
@@ -114,7 +114,7 @@ add(int fd)
i = entry - 1;
ent = (void*)((char*)tbl->map_data + i *
le32toh(hdr->hdr_entsz));
- le_uuid_dec(ent->ent_type, &uuid);
+ uuid_dec_le(ent->ent_type, &uuid);
if (!uuid_is_nil(&uuid, NULL)) {
warnx("%s: error: entry at index %u is not free",
device_name, entry);
@@ -125,7 +125,7 @@ add(int fd)
for (i = 0; i < le32toh(hdr->hdr_entries); i++) {
ent = (void*)((char*)tbl->map_data + i *
le32toh(hdr->hdr_entsz));
- le_uuid_dec(ent->ent_type, &uuid);
+ uuid_dec_le(ent->ent_type, &uuid);
if (uuid_is_nil(&uuid, NULL))
break;
}
@@ -153,7 +153,7 @@ add(int fd)
}
}
- le_uuid_enc(ent->ent_type, &type);
+ uuid_enc_le(ent->ent_type, &type);
ent->ent_lba_start = htole64(map->map_start);
ent->ent_lba_end = htole64(map->map_start + map->map_size - 1LL);
if (name != NULL)
@@ -170,7 +170,7 @@ add(int fd)
hdr = tpg->map_data;
ent = (void*)((char*)lbt->map_data + i * le32toh(hdr->hdr_entsz));
- le_uuid_enc(ent->ent_type, &type);
+ uuid_enc_le(ent->ent_type, &type);
ent->ent_lba_start = htole64(map->map_start);
ent->ent_lba_end = htole64(map->map_start + map->map_size - 1LL);
if (name != NULL)
Index: src/sbin/gpt/backup.c
diff -u src/sbin/gpt/backup.c:1.6 src/sbin/gpt/backup.c:1.7
--- src/sbin/gpt/backup.c:1.6 Mon Sep 29 18:22:03 2014
+++ src/sbin/gpt/backup.c Mon Sep 29 22:12:55 2014
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/show.c,v 1.14 2006/06/22 22:22:32 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: backup.c,v 1.6 2014/09/29 22:22:03 christos Exp $");
+__RCSID("$NetBSD: backup.c,v 1.7 2014/09/30 02:12:55 christos Exp $");
#endif
#include <sys/bootblock.h>
@@ -201,7 +201,7 @@ backup(void)
rc = prop_dictionary_set(type_dict, "revision",
propnum);
PROP_ERR(rc);
- le_uuid_dec(hdr->hdr_guid, &u);
+ uuid_dec_le(hdr->hdr_guid, &u);
uuid_to_string(&u, &s, NULL);
propstr = prop_string_create_cstring(s);
free(s);
@@ -232,14 +232,14 @@ backup(void)
rc = prop_dictionary_set(gpt_dict, "index",
propnum);
PROP_ERR(propnum);
- le_uuid_dec(ent->ent_type, &u);
+ uuid_dec_le(ent->ent_type, &u);
uuid_to_string(&u, &s, NULL);
propstr = prop_string_create_cstring(s);
free(s);
PROP_ERR(propstr);
rc = prop_dictionary_set(gpt_dict, "type",
propstr);
- le_uuid_dec(ent->ent_guid, &u);
+ uuid_dec_le(ent->ent_guid, &u);
uuid_to_string(&u, &s, NULL);
propstr = prop_string_create_cstring(s);
free(s);
Index: src/sbin/gpt/create.c
diff -u src/sbin/gpt/create.c:1.8 src/sbin/gpt/create.c:1.9
--- src/sbin/gpt/create.c:1.8 Mon Sep 29 16:28:57 2014
+++ src/sbin/gpt/create.c Mon Sep 29 22:12:55 2014
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/create.c,v 1.11 2005/08/31 01:47:19 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: create.c,v 1.8 2014/09/29 20:28:57 christos Exp $");
+__RCSID("$NetBSD: create.c,v 1.9 2014/09/30 02:12:55 christos Exp $");
#endif
#include <sys/types.h>
@@ -170,13 +170,13 @@ create(int fd)
hdr = gpt->map_data;
memcpy(hdr->hdr_sig, GPT_HDR_SIG, sizeof(hdr->hdr_sig));
hdr->hdr_revision = htole32(GPT_HDR_REVISION);
- hdr->hdr_size = htole32(GPT_SIZE);
+ hdr->hdr_size = htole32(GPT_HDR_SIZE);
hdr->hdr_lba_self = htole64(gpt->map_start);
hdr->hdr_lba_alt = htole64(last);
hdr->hdr_lba_start = htole64(tbl->map_start + blocks);
hdr->hdr_lba_end = htole64(last - blocks - 1LL);
uuid_create(&uuid, NULL);
- le_uuid_enc(hdr->hdr_uuid, &uuid);
+ uuid_enc_le(hdr->hdr_guid, &uuid);
hdr->hdr_lba_table = htole64(tbl->map_start);
hdr->hdr_entries = htole32((blocks * secsz) / sizeof(struct gpt_ent));
if (le32toh(hdr->hdr_entries) > parts)
@@ -186,7 +186,7 @@ create(int fd)
ent = tbl->map_data;
for (i = 0; i < le32toh(hdr->hdr_entries); i++) {
uuid_create(&uuid, NULL);
- le_uuid_enc(ent[i].ent_uuid, &uuid);
+ uuid_enc_le(ent[i].ent_guid, &uuid);
}
hdr->hdr_crc_table = htole32(crc32(ent, le32toh(hdr->hdr_entries) *
Index: src/sbin/gpt/gpt.c
diff -u src/sbin/gpt/gpt.c:1.32 src/sbin/gpt/gpt.c:1.33
--- src/sbin/gpt/gpt.c:1.32 Mon Sep 29 17:04:34 2014
+++ src/sbin/gpt/gpt.c Mon Sep 29 22:12:55 2014
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: gpt.c,v 1.32 2014/09/29 21:04:34 christos Exp $");
+__RCSID("$NetBSD: gpt.c,v 1.33 2014/09/30 02:12:55 christos Exp $");
#endif
#include <sys/param.h>
@@ -622,7 +622,7 @@ gpt_gpt(int fd, off_t lba, int found)
size = le64toh(ent->ent_lba_end) - le64toh(ent->ent_lba_start) +
1LL;
if (verbose > 2) {
- le_uuid_dec(&ent->ent_type, &type);
+ uuid_dec_le(&ent->ent_type, &type);
uuid_to_string(&type, &s, NULL);
warnx(
"%s: GPT partition: type=%s, start=%llu, size=%llu", device_name, s,
Index: src/sbin/gpt/gpt.h
diff -u src/sbin/gpt/gpt.h:1.14 src/sbin/gpt/gpt.h:1.15
--- src/sbin/gpt/gpt.h:1.14 Mon Sep 29 18:22:03 2014
+++ src/sbin/gpt/gpt.h Mon Sep 29 22:12:55 2014
@@ -35,14 +35,9 @@
#else
#include <nbinclude/sys/disklabel_gpt.h>
#endif
-#define GPT_SIZE GPT_HDR_SIZE
-#define hdr_uuid hdr_guid
-#define ent_uuid ent_guid
#include <uuid.h>
-#define le_uuid_dec uuid_dec_le
-#define le_uuid_enc uuid_enc_le
int parse_uuid(const char *, uuid_t *);
struct mbr_part {
Index: src/sbin/gpt/remove.c
diff -u src/sbin/gpt/remove.c:1.14 src/sbin/gpt/remove.c:1.15
--- src/sbin/gpt/remove.c:1.14 Mon Sep 29 16:28:57 2014
+++ src/sbin/gpt/remove.c Mon Sep 29 22:12:55 2014
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/remove.c,v 1.10 2006/10/04 18:20:25 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: remove.c,v 1.14 2014/09/29 20:28:57 christos Exp $");
+__RCSID("$NetBSD: remove.c,v 1.15 2014/09/30 02:12:55 christos Exp $");
#endif
#include <sys/types.h>
@@ -123,14 +123,14 @@ rem(int fd)
(char *)utf16_to_utf8(ent->ent_name)) != 0)
continue;
- le_uuid_dec(ent->ent_type, &uuid);
+ uuid_dec_le(ent->ent_type, &uuid);
if (!uuid_is_nil(&type, NULL) &&
!uuid_equal(&type, &uuid, NULL))
continue;
/* Remove the primary entry by clearing the partition type. */
uuid_create_nil(&uuid, NULL);
- le_uuid_enc(ent->ent_type, &uuid);
+ uuid_enc_le(ent->ent_type, &uuid);
hdr->hdr_crc_table = htole32(crc32(tbl->map_data,
le32toh(hdr->hdr_entries) * le32toh(hdr->hdr_entsz)));
@@ -145,7 +145,7 @@ rem(int fd)
le32toh(hdr->hdr_entsz));
/* Remove the secondary entry. */
- le_uuid_enc(ent->ent_type, &uuid);
+ uuid_enc_le(ent->ent_type, &uuid);
hdr->hdr_crc_table = htole32(crc32(lbt->map_data,
le32toh(hdr->hdr_entries) * le32toh(hdr->hdr_entsz)));
Index: src/sbin/gpt/label.c
diff -u src/sbin/gpt/label.c:1.16 src/sbin/gpt/label.c:1.17
--- src/sbin/gpt/label.c:1.16 Mon Sep 29 16:28:57 2014
+++ src/sbin/gpt/label.c Mon Sep 29 22:12:55 2014
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/label.c,v 1.3 2006/10/04 18:20:25 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: label.c,v 1.16 2014/09/29 20:28:57 christos Exp $");
+__RCSID("$NetBSD: label.c,v 1.17 2014/09/30 02:12:55 christos Exp $");
#endif
#include <sys/types.h>
@@ -124,7 +124,7 @@ label(int fd)
(char *)utf16_to_utf8(ent->ent_name)) != 0)
continue;
- le_uuid_dec(ent->ent_type, &uuid);
+ uuid_dec_le(ent->ent_type, &uuid);
if (!uuid_is_nil(&type, NULL) &&
!uuid_equal(&type, &uuid, NULL))
continue;
Index: src/sbin/gpt/migrate.c
diff -u src/sbin/gpt/migrate.c:1.17 src/sbin/gpt/migrate.c:1.18
--- src/sbin/gpt/migrate.c:1.17 Mon Sep 29 18:22:03 2014
+++ src/sbin/gpt/migrate.c Mon Sep 29 22:12:55 2014
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/migrate.c,v 1.16 2005/09/01 02:42:52 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: migrate.c,v 1.17 2014/09/29 22:22:03 christos Exp $");
+__RCSID("$NetBSD: migrate.c,v 1.18 2014/09/30 02:12:55 christos Exp $");
#endif
#include <sys/types.h>
@@ -126,28 +126,28 @@ migrate_disklabel(int fd, off_t start, s
continue;
case FS_SWAP: {
static const uuid_t swap = GPT_ENT_TYPE_FREEBSD_SWAP;
- le_uuid_enc(ent->ent_type, &swap);
+ uuid_enc_le(ent->ent_type, &swap);
utf8_to_utf16((const uint8_t *)"FreeBSD swap partition",
ent->ent_name, 36);
break;
}
case FS_BSDFFS: {
static const uuid_t ufs = GPT_ENT_TYPE_FREEBSD_UFS;
- le_uuid_enc(ent->ent_type, &ufs);
+ uuid_enc_le(ent->ent_type, &ufs);
utf8_to_utf16((const uint8_t *)"FreeBSD UFS partition",
ent->ent_name, 36);
break;
}
case FREEBSD_FS_VINUM: {
static const uuid_t vinum = GPT_ENT_TYPE_FREEBSD_VINUM;
- le_uuid_enc(ent->ent_type, &vinum);
+ uuid_enc_le(ent->ent_type, &vinum);
utf8_to_utf16((const uint8_t *)"FreeBSD vinum partition",
ent->ent_name, 36);
break;
}
case FREEBSD_FS_ZFS: {
static const uuid_t zfs = GPT_ENT_TYPE_FREEBSD_ZFS;
- le_uuid_enc(ent->ent_type, &zfs);
+ uuid_enc_le(ent->ent_type, &zfs);
utf8_to_utf16((const uint8_t *)"FreeBSD ZFS partition",
ent->ent_name, 36);
break;
@@ -208,42 +208,42 @@ migrate_netbsd_disklabel(int fd, off_t s
continue;
case FS_SWAP: {
static const uuid_t swap = GPT_ENT_TYPE_NETBSD_SWAP;
- le_uuid_enc(ent->ent_type, &swap);
+ uuid_enc_le(ent->ent_type, &swap);
utf8_to_utf16((const uint8_t *)"NetBSD swap partition",
ent->ent_name, 36);
break;
}
case FS_BSDFFS: {
static const uuid_t ufs = GPT_ENT_TYPE_NETBSD_FFS;
- le_uuid_enc(ent->ent_type, &ufs);
+ uuid_enc_le(ent->ent_type, &ufs);
utf8_to_utf16((const uint8_t *)"NetBSD FFS partition",
ent->ent_name, 36);
break;
}
case FS_BSDLFS: {
static const uuid_t zfs = GPT_ENT_TYPE_NETBSD_LFS;
- le_uuid_enc(ent->ent_type, &zfs);
+ uuid_enc_le(ent->ent_type, &zfs);
utf8_to_utf16((const uint8_t *)"NetBSD LFS partition",
ent->ent_name, 36);
break;
}
case FS_RAID: {
static const uuid_t zfs = GPT_ENT_TYPE_NETBSD_RAIDFRAME;
- le_uuid_enc(ent->ent_type, &zfs);
+ uuid_enc_le(ent->ent_type, &zfs);
utf8_to_utf16((const uint8_t *)"NetBSD RAIDframe partition",
ent->ent_name, 36);
break;
}
case FS_CCD: {
static const uuid_t zfs = GPT_ENT_TYPE_NETBSD_CCD;
- le_uuid_enc(ent->ent_type, &zfs);
+ uuid_enc_le(ent->ent_type, &zfs);
utf8_to_utf16((const uint8_t *)"NetBSD CCD partition",
ent->ent_name, 36);
break;
}
case FS_CGD: {
static const uuid_t zfs = GPT_ENT_TYPE_NETBSD_CGD;
- le_uuid_enc(ent->ent_type, &zfs);
+ uuid_enc_le(ent->ent_type, &zfs);
utf8_to_utf16((const uint8_t *)"NetBSD CGD partition",
ent->ent_name, 36);
break;
@@ -351,13 +351,13 @@ migrate(int fd)
* XXX struct gpt_hdr is not a multiple of 8 bytes in size and thus
* contains padding we must not include in the size.
*/
- hdr->hdr_size = htole32(GPT_SIZE);
+ hdr->hdr_size = htole32(GPT_HDR_SIZE);
hdr->hdr_lba_self = htole64(gpt->map_start);
hdr->hdr_lba_alt = htole64(tpg->map_start);
hdr->hdr_lba_start = htole64(tbl->map_start + blocks);
hdr->hdr_lba_end = htole64(lbt->map_start - 1LL);
uuid_create(&uuid, NULL);
- le_uuid_enc(hdr->hdr_uuid, &uuid);
+ uuid_enc_le(hdr->hdr_guid, &uuid);
hdr->hdr_lba_table = htole64(tbl->map_start);
hdr->hdr_entries = htole32((blocks * secsz) / sizeof(struct gpt_ent));
if (le32toh(hdr->hdr_entries) > parts)
@@ -367,7 +367,7 @@ migrate(int fd)
ent = tbl->map_data;
for (i = 0; i < le32toh(hdr->hdr_entries); i++) {
uuid_create(&uuid, NULL);
- le_uuid_enc(ent[i].ent_uuid, &uuid);
+ uuid_enc_le(ent[i].ent_guid, &uuid);
}
/* Mirror partitions. */
@@ -383,7 +383,7 @@ migrate(int fd)
case MBR_PTYPE_386BSD: { /* FreeBSD */
if (slice) {
static const uuid_t freebsd = GPT_ENT_TYPE_FREEBSD;
- le_uuid_enc(ent->ent_type, &freebsd);
+ uuid_enc_le(ent->ent_type, &freebsd);
ent->ent_lba_start = htole64((uint64_t)start);
ent->ent_lba_end = htole64(start + size - 1LL);
utf8_to_utf16((const uint8_t *)"FreeBSD disklabel partition",
@@ -398,7 +398,7 @@ migrate(int fd)
break;
case MBR_PTYPE_EFI: {
static const uuid_t efi_slice = GPT_ENT_TYPE_EFI;
- le_uuid_enc(ent->ent_type, &efi_slice);
+ uuid_enc_le(ent->ent_type, &efi_slice);
ent->ent_lba_start = htole64((uint64_t)start);
ent->ent_lba_end = htole64(start + size - 1LL);
utf8_to_utf16((const uint8_t *)"EFI system partition",
Index: src/sbin/gpt/show.c
diff -u src/sbin/gpt/show.c:1.17 src/sbin/gpt/show.c:1.18
--- src/sbin/gpt/show.c:1.17 Mon Sep 29 18:22:03 2014
+++ src/sbin/gpt/show.c Mon Sep 29 22:12:55 2014
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/show.c,v 1.14 2006/06/22 22:22:32 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: show.c,v 1.17 2014/09/29 22:22:03 christos Exp $");
+__RCSID("$NetBSD: show.c,v 1.18 2014/09/30 02:12:55 christos Exp $");
#endif
#include <sys/types.h>
@@ -202,12 +202,12 @@ show(void)
printf("- \"%s\"",
utf16_to_utf8(ent->ent_name));
} else if (show_guid) {
- le_uuid_dec(ent->ent_guid, &guid);
+ uuid_dec_le(ent->ent_guid, &guid);
uuid_to_string(&guid, &s, NULL);
printf("- %s", s);
free(s);
} else {
- le_uuid_dec(ent->ent_type, &type);
+ uuid_dec_le(ent->ent_type, &type);
printf("- %s", friendly(&type));
}
break;
@@ -263,7 +263,7 @@ show_one(void)
#endif
printf("Size: %llu\n", (long long)m->map_size);
- le_uuid_dec(ent->ent_type, &type);
+ uuid_dec_le(ent->ent_type, &type);
s1 = friendly(&type);
uuid_to_string(&type, &s2, NULL);
if (strcmp(s1, s2) == 0)
@@ -271,7 +271,7 @@ show_one(void)
printf("Type: %s (%s)\n", s1, s2);
free(s2);
- le_uuid_dec(ent->ent_guid, &guid);
+ uuid_dec_le(ent->ent_guid, &guid);
uuid_to_string(&guid, &s2, NULL);
printf("GUID: %s\n", s2);
free(s2);
Index: src/sbin/gpt/resize.c
diff -u src/sbin/gpt/resize.c:1.9 src/sbin/gpt/resize.c:1.10
--- src/sbin/gpt/resize.c:1.9 Mon Sep 29 16:28:57 2014
+++ src/sbin/gpt/resize.c Mon Sep 29 22:12:55 2014
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: resize.c,v 1.9 2014/09/29 20:28:57 christos Exp $");
+__RCSID("$NetBSD: resize.c,v 1.10 2014/09/30 02:12:55 christos Exp $");
#endif
#include <sys/types.h>
@@ -108,7 +108,7 @@ resize(int fd)
i = entry - 1;
ent = (void*)((char*)tbl->map_data + i *
le32toh(hdr->hdr_entsz));
- le_uuid_dec(ent->ent_type, &uuid);
+ uuid_dec_le(ent->ent_type, &uuid);
if (uuid_is_nil(&uuid, NULL)) {
warnx("%s: error: entry at index %u is unused",
device_name, entry);
Index: src/sbin/gpt/resizedisk.c
diff -u src/sbin/gpt/resizedisk.c:1.3 src/sbin/gpt/resizedisk.c:1.4
--- src/sbin/gpt/resizedisk.c:1.3 Mon Sep 29 16:28:57 2014
+++ src/sbin/gpt/resizedisk.c Mon Sep 29 22:12:55 2014
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: resizedisk.c,v 1.3 2014/09/29 20:28:57 christos Exp $");
+__RCSID("$NetBSD: resizedisk.c,v 1.4 2014/09/30 02:12:55 christos Exp $");
#endif
#include <sys/bootblock.h>
@@ -139,7 +139,7 @@ resizedisk(int fd)
for (ent = tbl->map_data; ent <
(struct gpt_ent *)((char *)tbl->map_data +
le32toh(hdr->hdr_entries) * le32toh(hdr->hdr_entsz)); ent++) {
- le_uuid_dec(ent->ent_type, &uuid);
+ uuid_dec_le(ent->ent_type, &uuid);
if (!uuid_is_nil(&uuid, NULL) &&
(le64toh(ent->ent_lba_end) > lastdata)) {
lastdata = le64toh(ent->ent_lba_end);
Index: src/sbin/gpt/set.c
diff -u src/sbin/gpt/set.c:1.3 src/sbin/gpt/set.c:1.4
--- src/sbin/gpt/set.c:1.3 Mon Sep 29 16:28:57 2014
+++ src/sbin/gpt/set.c Mon Sep 29 22:12:55 2014
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: set.c,v 1.3 2014/09/29 20:28:57 christos Exp $");
+__RCSID("$NetBSD: set.c,v 1.4 2014/09/30 02:12:55 christos Exp $");
#endif
#include <sys/types.h>
@@ -106,7 +106,7 @@ set(int fd)
i = entry - 1;
ent = (void*)((char*)tbl->map_data + i *
le32toh(hdr->hdr_entsz));
- le_uuid_dec(ent->ent_type, &uuid);
+ uuid_dec_le(ent->ent_type, &uuid);
if (uuid_is_nil(&uuid, NULL)) {
warnx("%s: error: entry at index %u is unused",
device_name, entry);
Index: src/sbin/gpt/type.c
diff -u src/sbin/gpt/type.c:1.3 src/sbin/gpt/type.c:1.4
--- src/sbin/gpt/type.c:1.3 Mon Sep 29 16:28:57 2014
+++ src/sbin/gpt/type.c Mon Sep 29 22:12:55 2014
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/remove.c,v 1.10 2006/10/04 18:20:25 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: type.c,v 1.3 2014/09/29 20:28:57 christos Exp $");
+__RCSID("$NetBSD: type.c,v 1.4 2014/09/30 02:12:55 christos Exp $");
#endif
#include <sys/types.h>
@@ -125,13 +125,13 @@ chtype(int fd)
(char *)utf16_to_utf8(ent->ent_name)) != 0)
continue;
- le_uuid_dec(ent->ent_type, &uuid);
+ uuid_dec_le(ent->ent_type, &uuid);
if (!uuid_is_nil(&type, NULL) &&
!uuid_equal(&type, &uuid, NULL))
continue;
/* Change the primary entry. */
- le_uuid_enc(ent->ent_type, &newtype);
+ uuid_enc_le(ent->ent_type, &newtype);
hdr->hdr_crc_table = htole32(crc32(tbl->map_data,
le32toh(hdr->hdr_entries) * le32toh(hdr->hdr_entsz)));
@@ -146,7 +146,7 @@ chtype(int fd)
le32toh(hdr->hdr_entsz));
/* Change the secondary entry. */
- le_uuid_enc(ent->ent_type, &newtype);
+ uuid_enc_le(ent->ent_type, &newtype);
hdr->hdr_crc_table = htole32(crc32(lbt->map_data,
le32toh(hdr->hdr_entries) * le32toh(hdr->hdr_entsz)));
Index: src/sbin/gpt/unset.c
diff -u src/sbin/gpt/unset.c:1.3 src/sbin/gpt/unset.c:1.4
--- src/sbin/gpt/unset.c:1.3 Mon Sep 29 16:28:57 2014
+++ src/sbin/gpt/unset.c Mon Sep 29 22:12:55 2014
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: unset.c,v 1.3 2014/09/29 20:28:57 christos Exp $");
+__RCSID("$NetBSD: unset.c,v 1.4 2014/09/30 02:12:55 christos Exp $");
#endif
#include <sys/types.h>
@@ -106,7 +106,7 @@ unset(int fd)
i = entry - 1;
ent = (void*)((char*)tbl->map_data + i *
le32toh(hdr->hdr_entsz));
- le_uuid_dec(ent->ent_type, &uuid);
+ uuid_dec_le(ent->ent_type, &uuid);
if (uuid_is_nil(&uuid, NULL)) {
warnx("%s: error: entry at index %u is unused",
device_name, entry);
Index: src/sbin/gpt/restore.c
diff -u src/sbin/gpt/restore.c:1.4 src/sbin/gpt/restore.c:1.5
--- src/sbin/gpt/restore.c:1.4 Mon Sep 29 16:28:57 2014
+++ src/sbin/gpt/restore.c Mon Sep 29 22:12:55 2014
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/create.c,v 1.11 2005/08/31 01:47:19 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: restore.c,v 1.4 2014/09/29 20:28:57 christos Exp $");
+__RCSID("$NetBSD: restore.c,v 1.5 2014/09/30 02:12:55 christos Exp $");
#endif
#include <sys/types.h>
@@ -151,7 +151,7 @@ restore(int fd)
warnx("%s: not able to convert to an UUID\n", s);
return;
}
- le_uuid_enc(&gpt_guid, &uuid);
+ uuid_enc_le(&gpt_guid, &uuid);
firstdata = gpt_size + 2; /* PMBR and GPT header */
lastdata = last - gpt_size - 1; /* alt. GPT table and header */
@@ -315,7 +315,7 @@ restore(int fd)
warnx("%s: not able to convert to an UUID\n", s);
return;
}
- le_uuid_enc(&ent.ent_type, &uuid);
+ uuid_enc_le(&ent.ent_type, &uuid);
propstr = prop_dictionary_get(gpt_dict, "guid");
PROP_ERR(propstr);
s = prop_string_cstring_nocopy(propstr);
@@ -324,7 +324,7 @@ restore(int fd)
warnx("%s: not able to convert to an UUID\n", s);
return;
}
- le_uuid_enc(&ent.ent_guid, &uuid);
+ uuid_enc_le(&ent.ent_guid, &uuid);
propnum = prop_dictionary_get(gpt_dict, "start");
PROP_ERR(propnum);
ent.ent_lba_start =
