summaryrefslogtreecommitdiff
path: root/sbin/fdisk
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2023-04-08 15:25:48 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2023-04-08 15:25:48 +0000
commitca1066c1ffe9649d10711e49c86288c81aa83e76 (patch)
treefa81ec70f7b9931223f13113cd2ea3f1b0fd7349 /sbin/fdisk
parent3ae817e9e66cd73dcbb920d8f7d1dace958de1f0 (diff)
A bit more guid vs uuid naming consistency.
No functional change.
Diffstat (limited to 'sbin/fdisk')
-rw-r--r--sbin/fdisk/part.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sbin/fdisk/part.c b/sbin/fdisk/part.c
index b0f68d5e0eb..d3d4cae324d 100644
--- a/sbin/fdisk/part.c
+++ b/sbin/fdisk/part.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: part.c,v 1.152 2023/04/07 14:42:51 krw Exp $ */
+/* $OpenBSD: part.c,v 1.153 2023/04/08 15:25:47 krw Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -1112,18 +1112,18 @@ PRT_uuid_to_menuid(const struct uuid *uuid)
const struct uuid *
PRT_menuid_to_uuid(const int menuid)
{
- static struct uuid guid;
+ static struct uuid uuid;
unsigned int i;
uint32_t status = uuid_s_ok;
for (i = 0; i < nitems(menu_items); i++) {
if (gpt_item(i) == 0 && menu_items[i].mi_menuid == menuid) {
- uuid_from_string(menu_items[i].mi_guid, &guid, &status);
+ uuid_from_string(menu_items[i].mi_guid, &uuid, &status);
break;
}
}
if (i == nitems(menu_items) || status != uuid_s_ok)
- uuid_create_nil(&guid, NULL);
+ uuid_create_nil(&uuid, NULL);
- return &guid;
+ return &uuid;
}