 @@ -19,50 +19,50 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifdef __FBSDID
 __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.10 2011/01/06 17:51:28 riz Exp $");
+__RCSID("$NetBSD: add.c,v 1.11 2011/08/27 17:38:16 joerg Exp $");
 #endif
 #include <sys/types.h>
 #include <err.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <inttypes.h>
 #include "map.h"
 #include "gpt.h"
 static uuid_t type;
 static off_t block, size;
 static unsigned int entry;
 const char addmsg[] = "add [-b lba] [-i index] [-s lba] [-t type] "
 	"device ...";
-static void
+__dead static void
 usage_add(void)
+{
 	fprintf(stderr,
 	    "usage: %s %s\n",
 	    getprogname(), addmsg);
 	exit(1);
+}
 static void
 add(int fd)
+{
 	map_t *gpt, *tpg;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: biosboot.c,v 1.4 2011/08/17 12:27:50 martin Exp $ */
+/*	$NetBSD: biosboot.c,v 1.5 2011/08/27 17:38:16 joerg Exp $ */
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to the NetBSD Foundation
  * by Mike M. Volokhov. Development of this software was supported by the
  * Google Summer of Code program.
  * The GSoC project was mentored by Allen Briggs and Joerg Sonnenberger.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -23,27 +23,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifdef __RCSID
-__RCSID("$NetBSD: biosboot.c,v 1.4 2011/08/17 12:27:50 martin Exp $");
+__RCSID("$NetBSD: biosboot.c,v 1.5 2011/08/27 17:38:16 joerg Exp $");
 #endif
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/disk.h>
 #include <sys/param.h>
 #include <sys/bootblock.h>
 #include <err.h>
 #include <fcntl.h>
 #include <inttypes.h>
 #include <paths.h>
 @@ -58,27 +58,27 @@ __RCSID("$NetBSD: biosboot.c,v 1.4 2011/
 #include "gpt.h"
 #define DEFAULT_BOOTDIR		"/usr/mdec"
 #define DEFAULT_BOOTCODE	"gptmbr.bin"
 static daddr_t start;
 static uint64_t size;
 static char *bootpath;
 static unsigned int entry;
 const char biosbootmsg[] = "biosboot [-c bootcode] [-i index] device ...";
-static void
+__dead static void
 usage_biosboot(void)
+{
 	fprintf(stderr, "usage: %s %s\n", getprogname(), biosbootmsg);
 	exit(1);
+}
 static struct mbr*
 read_boot(void)
+{
 	int bfd, ret = 0;
 	struct mbr *buf;
 	struct stat st;

 @@ -19,47 +19,47 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifdef __FBSDID
 __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.4 2011/01/06 17:42:10 jakllsch Exp $");
+__RCSID("$NetBSD: create.c,v 1.5 2011/08/27 17:38:16 joerg Exp $");
 #endif
 #include <sys/types.h>
 #include <err.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "map.h"
 #include "gpt.h"
 static int force;
 static int primary_only;
 const char createmsg[] = "create [-fp] device ...";
-static void
+__dead static void
 usage_create(void)
+{
 	fprintf(stderr,
 	    "usage: %s %s\n", getprogname(), createmsg);
 	exit(1);
+}
 static void
 create(int fd)
+{
 	uuid_t uuid;
 	off_t blocks, last;

 @@ -19,27 +19,27 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifdef __FBSDID
 __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.4 2007/12/18 21:46:46 riz Exp $");
+__RCSID("$NetBSD: migrate.c,v 1.5 2011/08/27 17:38:16 joerg Exp $");
 #endif
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/disklabel.h>
 #include <err.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 @@ -52,27 +52,27 @@ __RCSID("$NetBSD: migrate.c,v 1.4 2007/1
  */
 #ifndef LABELOFFSET
 #define	LABELOFFSET	0
 #endif
 #ifndef LABELSECTOR
 #define	LABELSECTOR	1
 #endif
 static int force;
 static int slice;
 const char migratemsg[] = "migrate [-fs] device ...";
-static void
+__dead static void
 usage_migrate(void)
+{
 	fprintf(stderr,
 	    "usage: %s %s\n", getprogname(), migratemsg);
 	exit(1);
+}
 static struct gpt_ent*
 migrate_disklabel(int fd, off_t start, struct gpt_ent *ent)
+{
 	char *buf;
 	struct disklabel *dl;

 @@ -19,46 +19,46 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: src/sbin/gpt/destroy.c,v 1.6 2005/08/31 01:47:19 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: destroy.c,v 1.3 2007/12/18 21:46:46 riz Exp $");
+__RCSID("$NetBSD: destroy.c,v 1.4 2011/08/27 17:38:16 joerg Exp $");
 #endif
 #include <sys/types.h>
 #include <err.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "map.h"
 #include "gpt.h"
 static int recoverable;
 const char destroymsg[] = "destroy [-r] device ...";
-static void
+__dead static void
 usage_destroy(void)
+{
 	fprintf(stderr,
 	    "usage: %s %s\n", getprogname(), destroymsg);
 	exit(1);
+}
 static void
 destroy(int fd)
+{
 	map_t *pri_hdr, *sec_hdr;

 @@ -19,46 +19,46 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: src/sbin/gpt/recover.c,v 1.8 2005/08/31 01:47:19 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: recover.c,v 1.3 2007/12/18 21:46:47 riz Exp $");
+__RCSID("$NetBSD: recover.c,v 1.4 2011/08/27 17:38:16 joerg Exp $");
 #endif
 #include <sys/types.h>
 #include <err.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "map.h"
 #include "gpt.h"
 static int recoverable;
 const char recovermsg[] = "recover device ...";
-static void
+__dead static void
 usage_recover(void)
+{
 	fprintf(stderr,
 	    "usage: %s %s\n", getprogname(), recovermsg);
 	exit(1);
+}
 static void
 recover(int fd)
+{
 	off_t last;
 	map_t *gpt, *tpg;

 @@ -21,27 +21,27 @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  * CRC32 code derived from work by Gary S. Brown.
  */
 #include <sys/cdefs.h>
 #ifdef __FBSDID
 __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.14 2011/01/06 16:30:40 jakllsch Exp $");
+__RCSID("$NetBSD: gpt.c,v 1.15 2011/08/27 17:38:16 joerg Exp $");
 #endif
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/disk.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <paths.h>
 #include <stddef.h>
 @@ -767,27 +767,27 @@ static struct {
 	{ cmd_create, "create" },
 	{ cmd_destroy, "destroy" },
 	{ NULL, "help" },
 	{ cmd_label, "label" },
 	{ cmd_migrate, "migrate" },
 	{ cmd_recover, "recover" },
 	{ cmd_remove, "remove" },
 	{ NULL, "rename" },
 	{ cmd_show, "show" },
 	{ NULL, "verify" },
 	{ NULL, NULL }
 };
-static void
+__dead static void
 usage(void)
+{
 	extern const char addmsg[], biosbootmsg[], createmsg[], destroymsg[];
 	extern const char labelmsg1[], labelmsg2[], labelmsg3[];
 	extern const char migratemsg[], recovermsg[], removemsg1[];
 	extern const char removemsg2[], showmsg[];
 	fprintf(stderr,
 	    "usage: %s %s\n"
 	    "       %s %s\n"
 	    "       %s %s\n"
 	    "       %s %s\n"
 	    "       %s %s\n"

 @@ -19,52 +19,52 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifdef __FBSDID
 __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.7 2009/03/12 22:59:03 dyoung Exp $");
+__RCSID("$NetBSD: label.c,v 1.8 2011/08/27 17:38:16 joerg Exp $");
 #endif
 #include <sys/types.h>
 #include <err.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "map.h"
 #include "gpt.h"
 static int all;
 static uuid_t type;
 static off_t block, size;
 static unsigned int entry;
 static uint8_t *name;
 const char labelmsg1[] = "label -a <-l label | -f file> device ...";
 const char labelmsg2[] = "label [-b lba] [-i index] [-s lba]";
 const char labelmsg3[] = "      [-t uuid] <-l label | -f file> device ...";
-static void
+__dead static void
 usage_label(void)
+{
 	fprintf(stderr,
 	    "usage: %s %s\n"
 	    "       %s %s\n"
 	    "       %*s %s\n", getprogname(), labelmsg1,
 	    getprogname(), labelmsg2, (int)strlen(getprogname()), "", labelmsg3);
 	exit(1);
+}
 static void
 label(int fd)
+{

 @@ -19,51 +19,51 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifdef __FBSDID
 __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.5 2009/02/07 17:21:44 uebayasi Exp $");
+__RCSID("$NetBSD: remove.c,v 1.6 2011/08/27 17:38:16 joerg Exp $");
 #endif
 #include <sys/types.h>
 #include <err.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "map.h"
 #include "gpt.h"
 static int all;
 static uuid_t type;
 static off_t block, size;
 static unsigned int entry;
 const char removemsg1[] = "remove -a device ...";
 const char removemsg2[] = "remove [-b lba] [-i index] [-s lba] "
 	"[-t type] device ...";
-static void
+__dead static void
 usage_remove(void)
+{
 	fprintf(stderr,
 	    "usage: %s %s\n"
 	    "       %s %s\n",
 	    getprogname(), removemsg1, getprogname(), removemsg2);
 	exit(1);
+}
 static void
 rem(int fd)
+{

 @@ -19,47 +19,47 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifdef __FBSDID
 __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.6 2011/01/06 16:30:40 jakllsch Exp $");
+__RCSID("$NetBSD: show.c,v 1.7 2011/08/27 17:38:16 joerg Exp $");
 #endif
 #include <sys/types.h>
 #include <err.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "map.h"
 #include "gpt.h"
 static int show_label = 0;
 static int show_uuid = 0;
 const char showmsg[] = "show [-lu] device ...";
-static void
+__dead static void
 usage_show(void)
+{
 	fprintf(stderr,
 	    "usage: %s %s\n", getprogname(), showmsg);
 	exit(1);
+}
 static const char *
 friendly(uuid_t *t)
+{
 	static uuid_t efi_slice = GPT_ENT_TYPE_EFI;
 	static uuid_t bios_boot = GPT_ENT_TYPE_BIOS;