diff options
-rw-r--r-- | sbin/fsck/fsutil.c | 12 | ||||
-rw-r--r-- | sbin/fsck/fsutil.h | 2 | ||||
-rw-r--r-- | 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 f9fed44..b77eeeb 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 bad9a1d..877e346 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 6f44201..eb49486 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 |