From eaf8f4628d36adca1ca309dfcacd59f347d18be8 Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Sat, 27 Dec 2003 13:08:55 +0000
Subject: [PATCH] fsck_msdosfs/main.c: - Don't use errexit() to (mis)implement
 usage().  Using errexit() just   gave the bogus exit code 8. - Fixed 3 other
 style bugs in usage().

fsck/fsutil.[ch]:
- Garbage-collected errexit().  It is essentially just one of NetBSD's
  fsck_ext2fs error printing functions, but we don't have fsck_ext2fs
  and the function is unsuitable for use there too (since pfatal() is
  also used and it printf to a different stream).
---
 sbin/fsck/fsutil.c       | 12 ------------
 sbin/fsck/fsutil.h       |  2 --
 sbin/fsck_msdosfs/main.c |  6 ++++--
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c
index f9fed44e0ccb..b77eeebf345c 100644
--- a/sbin/fsck/fsutil.c
+++ b/sbin/fsck/fsutil.c
@@ -79,18 +79,6 @@ hotroot(void)
 	return hot;
 }
 
-/*VARARGS*/
-void
-errexit(const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	(void) vfprintf(stderr, fmt, ap);
-	va_end(ap);
-	exit(8);
-}
-
 static void
 vmsg(int fatal, const char *fmt, va_list ap)
 {
diff --git a/sbin/fsck/fsutil.h b/sbin/fsck/fsutil.h
index bad9a1db8a90..877e3468312b 100644
--- a/sbin/fsck/fsutil.h
+++ b/sbin/fsck/fsutil.h
@@ -31,8 +31,6 @@
  * $FreeBSD$
  */
 
-void errexit(const char *, ...)
-    __attribute__((__noreturn__,__format__(__printf__,1,2)));  
 void pfatal(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));  
 void pwarn(const char *, ...)
diff --git a/sbin/fsck_msdosfs/main.c b/sbin/fsck_msdosfs/main.c
index 6f4420155cc1..eb49486e4275 100644
--- a/sbin/fsck_msdosfs/main.c
+++ b/sbin/fsck_msdosfs/main.c
@@ -58,9 +58,11 @@ int rdonly;		/* device is opened read only (supersedes above) */
 static void usage(void) __dead2;
 
 static void
-usage()
+usage(void)
 {
-	errexit("usage: fsck_msdos [-fnpy] filesystem ... \n");
+
+	fprintf(stderr, "usage: fsck_msdos [-fnpy] filesystem ...\n");
+	exit(1);
 }
 
 int