From 7e3e26cdc13228db18c506f557860b7060b1d113 Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Sun, 26 Jan 2003 12:39:46 +0000
Subject: [PATCH] Offer better advice in #error.

Remove yet a usage message about -N/-W
---
 sbin/bsdlabel/bsdlabel.c   | 8 +++-----
 sbin/disklabel/disklabel.c | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index 16e5138219a6..1aeec99098c7 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -109,7 +109,7 @@ __FBSDID("$FreeBSD$");
 #elif defined(__alpha__)
 #define	NUMBOOT	1
 #else
-#error	I do not know about this architecture.
+#error	I do not know about this architecture, and shall probably not be compiled for it.
 #endif
 
 void	makelabel(const char *, const char *, struct disklabel *);
@@ -1653,16 +1653,14 @@ usage(void)
 #endif
 	);
 #else
-	fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
+	fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
 		"usage: disklabel [-r] disk", "(to read label)",
 		"       disklabel -w [-r] [-n] disk type [ packid ]",
 		"\t\t(to write label)",
 		"       disklabel -e [-r] [-n] disk",
 		"\t\t(to edit label)",
 		"       disklabel -R [-r] [-n] disk protofile",
-		"\t\t(to restore label)",
-		"       disklabel [-NW] disk",
-		"\t\t(to write disable/enable label)");
+		"\t\t(to restore label)");
 #endif
 	exit(1);
 }
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 16e5138219a6..1aeec99098c7 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -109,7 +109,7 @@ __FBSDID("$FreeBSD$");
 #elif defined(__alpha__)
 #define	NUMBOOT	1
 #else
-#error	I do not know about this architecture.
+#error	I do not know about this architecture, and shall probably not be compiled for it.
 #endif
 
 void	makelabel(const char *, const char *, struct disklabel *);
@@ -1653,16 +1653,14 @@ usage(void)
 #endif
 	);
 #else
-	fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
+	fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
 		"usage: disklabel [-r] disk", "(to read label)",
 		"       disklabel -w [-r] [-n] disk type [ packid ]",
 		"\t\t(to write label)",
 		"       disklabel -e [-r] [-n] disk",
 		"\t\t(to edit label)",
 		"       disklabel -R [-r] [-n] disk protofile",
-		"\t\t(to restore label)",
-		"       disklabel [-NW] disk",
-		"\t\t(to write disable/enable label)");
+		"\t\t(to restore label)");
 #endif
 	exit(1);
 }