Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sbin/gpt/set.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sbin/gpt/set.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- src/sbin/gpt/set.c	2014/09/30 02:12:55	1.4
+++ src/sbin/gpt/set.c	2014/09/30 18:00:00	1.5
@@ -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.4 2014/09/30 02:12:55 christos Exp $");
+__RCSID("$NetBSD: set.c,v 1.5 2014/09/30 18:00:00 christos Exp $");
 #endif
 
 #include <sys/types.h>
@@ -44,7 +44,6 @@ __RCSID("$NetBSD: set.c,v 1.4 2014/09/30
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <inttypes.h>
 
 #include "map.h"
 #include "gpt.h"
@@ -66,7 +65,6 @@ usage_set(void)
 static void
 set(int fd)
 {
-	uuid_t uuid;
 	map_t *gpt, *tpg;
 	map_t *tbl, *lbt;
 	struct gpt_hdr *hdr;
@@ -106,8 +104,7 @@ set(int fd)
 	i = entry - 1;
 	ent = (void*)((char*)tbl->map_data + i *
 	    le32toh(hdr->hdr_entsz));
-	uuid_dec_le(ent->ent_type, &uuid);
-	if (uuid_is_nil(&uuid, NULL)) {
+	if (gpt_uuid_is_nil(ent->ent_type)) {
 		warnx("%s: error: entry at index %u is unused",
 		    device_name, entry);
 		return;