diff options
| author | christos <christos@NetBSD.org> | 1998-11-12 16:19:47 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 1998-11-12 16:19:47 +0000 |
| commit | 7b57bf6d780f418dc32b0fe4d64625aa7b80ecc6 (patch) | |
| tree | c527adfec591b27b6cb6a0aa0cbbcd7cd60b3a0c | |
| parent | a5a8f8a117b343d0d8af27f8f5790159edf536f9 (diff) | |
Adjust for DKTYPENAME changes.
| -rw-r--r-- | sbin/bim/bim.c | 6 | ||||
| -rw-r--r-- | sbin/disklabel/disklabel.c | 5 | ||||
| -rw-r--r-- | sbin/disklabel/interact.c | 6 | ||||
| -rw-r--r-- | sbin/edlabel/edlabel.c | 4 | ||||
| -rw-r--r-- | sbin/fsck/fsck.c | 7 | ||||
| -rw-r--r-- | sbin/fsck_ext2fs/setup.c | 6 | ||||
| -rw-r--r-- | sbin/fsck_ffs/setup.c | 6 |
7 files changed, 21 insertions, 19 deletions
diff --git a/sbin/bim/bim.c b/sbin/bim/bim.c index b6f133b57bc..62273d4b9c9 100644 --- a/sbin/bim/bim.c +++ b/sbin/bim/bim.c @@ -1,4 +1,4 @@ -/* $NetBSD: bim.c,v 1.7 1997/11/16 07:35:52 phil Exp $ */ +/* $NetBSD: bim.c,v 1.8 1998/11/12 16:19:47 christos Exp $ */ /* * Copyright (c) 1994 Philip A. Nelson. @@ -33,7 +33,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: bim.c,v 1.7 1997/11/16 07:35:52 phil Exp $"); +__RCSID("$NetBSD: bim.c,v 1.8 1998/11/12 16:19:47 christos Exp $"); #endif /* not lint */ /* @@ -55,7 +55,7 @@ __RCSID("$NetBSD: bim.c,v 1.7 1997/11/16 07:35:52 phil Exp $"); #include <stdio.h> #include <string.h> -#define DKTYPENAMES +#define FSTYPENAMES #include <sys/disklabel.h> #include "images.h" diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index 18d8e37a452..684b08ad6e9 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -1,4 +1,4 @@ -/* $NetBSD: disklabel.c,v 1.59 1998/08/10 02:59:26 perry Exp $ */ +/* $NetBSD: disklabel.c,v 1.60 1998/11/12 16:19:48 christos Exp $ */ /* * Copyright (c) 1987, 1993 @@ -47,7 +47,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\ static char sccsid[] = "@(#)disklabel.c 8.4 (Berkeley) 5/4/95"; /* from static char sccsid[] = "@(#)disklabel.c 1.2 (Symmetric) 11/28/85"; */ #else -__RCSID("$NetBSD: disklabel.c,v 1.59 1998/08/10 02:59:26 perry Exp $"); +__RCSID("$NetBSD: disklabel.c,v 1.60 1998/11/12 16:19:48 christos Exp $"); #endif #endif /* not lint */ @@ -57,6 +57,7 @@ __RCSID("$NetBSD: disklabel.c,v 1.59 1998/08/10 02:59:26 perry Exp $"); #include <sys/stat.h> #include <sys/wait.h> #define DKTYPENAMES +#define FSTYPENAMES #include <sys/disklabel.h> #include <ufs/ufs/dinode.h> diff --git a/sbin/disklabel/interact.c b/sbin/disklabel/interact.c index f26482c10ff..576f72f5b9a 100644 --- a/sbin/disklabel/interact.c +++ b/sbin/disklabel/interact.c @@ -1,4 +1,4 @@ -/* $NetBSD: interact.c,v 1.7 1997/10/13 09:53:29 bouyer Exp $ */ +/* $NetBSD: interact.c,v 1.8 1998/11/12 16:19:48 christos Exp $ */ /* * Copyright (c) 1997 Christos Zoulas. All rights reserved. @@ -31,7 +31,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: interact.c,v 1.7 1997/10/13 09:53:29 bouyer Exp $"); +__RCSID("$NetBSD: interact.c,v 1.8 1998/11/12 16:19:48 christos Exp $"); #endif /* lint */ #include <stdio.h> @@ -40,7 +40,7 @@ __RCSID("$NetBSD: interact.c,v 1.7 1997/10/13 09:53:29 bouyer Exp $"); #include <util.h> #include <sys/types.h> #include <sys/param.h> -#define DKTYPENAMES +#define FSTYPENAMES #include <sys/disklabel.h> #include "extern.h" diff --git a/sbin/edlabel/edlabel.c b/sbin/edlabel/edlabel.c index b0e45436b67..ba483f7d87d 100644 --- a/sbin/edlabel/edlabel.c +++ b/sbin/edlabel/edlabel.c @@ -1,4 +1,4 @@ -/* $NetBSD: edlabel.c,v 1.6 1997/12/20 21:49:30 leo Exp $ */ +/* $NetBSD: edlabel.c,v 1.7 1998/11/12 16:19:48 christos Exp $ */ /* * Copyright (c) 1995 Gordon W. Ross @@ -34,7 +34,7 @@ #include <sys/types.h> #include <sys/param.h> #include <sys/ioctl.h> -#define DKTYPENAMES +#define FSTYPENAMES #include <sys/disklabel.h> #include <fcntl.h> diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c index 20465c6ab0c..92a43e44234 100644 --- a/sbin/fsck/fsck.c +++ b/sbin/fsck/fsck.c @@ -1,4 +1,4 @@ -/* $NetBSD: fsck.c,v 1.19 1998/08/25 19:18:14 ross Exp $ */ +/* $NetBSD: fsck.c,v 1.20 1998/11/12 16:19:48 christos Exp $ */ /* * Copyright (c) 1996 Christos Zoulas. All rights reserved. @@ -40,14 +40,15 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: fsck.c,v 1.19 1998/08/25 19:18:14 ross Exp $"); +__RCSID("$NetBSD: fsck.c,v 1.20 1998/11/12 16:19:48 christos Exp $"); #endif /* not lint */ #include <sys/param.h> #include <sys/mount.h> #include <sys/queue.h> #include <sys/wait.h> -#define DKTYPENAMES +#define FSTYPENAMES +#define FSCKNAMES #include <sys/disklabel.h> #include <sys/ioctl.h> diff --git a/sbin/fsck_ext2fs/setup.c b/sbin/fsck_ext2fs/setup.c index fc331a79eb0..db6ae552f24 100644 --- a/sbin/fsck_ext2fs/setup.c +++ b/sbin/fsck_ext2fs/setup.c @@ -1,4 +1,4 @@ -/* $NetBSD: setup.c,v 1.7 1998/07/26 20:27:20 mycroft Exp $ */ +/* $NetBSD: setup.c,v 1.8 1998/11/12 16:19:48 christos Exp $ */ /* * Copyright (c) 1997 Manuel Bouyer. @@ -39,11 +39,11 @@ #if 0 static char sccsid[] = "@(#)setup.c 8.5 (Berkeley) 11/23/94"; #else -__RCSID("$NetBSD: setup.c,v 1.7 1998/07/26 20:27:20 mycroft Exp $"); +__RCSID("$NetBSD: setup.c,v 1.8 1998/11/12 16:19:48 christos Exp $"); #endif #endif /* not lint */ -#define DKTYPENAMES +#define FSTYPENAMES #include <sys/param.h> #include <sys/time.h> #include <ufs/ext2fs/ext2fs_dinode.h> diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index 1109af21af0..df9f29c5efd 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -1,4 +1,4 @@ -/* $NetBSD: setup.c,v 1.34 1998/07/26 20:32:43 mycroft Exp $ */ +/* $NetBSD: setup.c,v 1.35 1998/11/12 16:19:48 christos Exp $ */ /* * Copyright (c) 1980, 1986, 1993 @@ -38,15 +38,15 @@ #if 0 static char sccsid[] = "@(#)setup.c 8.10 (Berkeley) 5/9/95"; #else -__RCSID("$NetBSD: setup.c,v 1.34 1998/07/26 20:32:43 mycroft Exp $"); +__RCSID("$NetBSD: setup.c,v 1.35 1998/11/12 16:19:48 christos Exp $"); #endif #endif /* not lint */ -#define DKTYPENAMES #include <sys/param.h> #include <sys/time.h> #include <sys/stat.h> #include <sys/ioctl.h> +#define FSTYPENAMES #include <sys/disklabel.h> #include <sys/file.h> |
