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/remove.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sbin/gpt/remove.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.3
retrieving revision 1.6
diff -u -p -r1.3 -r1.6
--- src/sbin/gpt/remove.c	2007/02/16 17:13:02	1.3
+++ src/sbin/gpt/remove.c	2011/08/27 17:38:16	1.6
@@ -29,7 +29,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.3 2007/02/16 17:13:02 riz Exp $");
+__RCSID("$NetBSD: remove.c,v 1.6 2011/08/27 17:38:16 joerg Exp $");
 #endif
 
 #include <sys/types.h>
@@ -49,14 +49,18 @@ static uuid_t type;
 static off_t block, size;
 static unsigned int entry;
 
-static void
+const char removemsg1[] = "remove -a device ...";
+const char removemsg2[] = "remove [-b lba] [-i index] [-s lba] "
+	"[-t type] device ...";
+
+__dead static void
 usage_remove(void)
 {
 
 	fprintf(stderr,
-	    "usage: %s -a device ...\n"
-	    "       %s [-b lba] [-i index] [-s lba] [-t uuid] device ...\n",
-	    getprogname(), getprogname());
+	    "usage: %s %s\n"
+	    "       %s %s\n",
+	    getprogname(), removemsg1, getprogname(), removemsg2);
 	exit(1);
 }