diff options
| author |   krw <krw@openbsd.org> | 2009-02-15 21:07:00 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2009-02-15 21:07:00 +0000 |
| commit | 6f093b5d9ba81c15d7c977679ad5c2a438ed9dbe (patch) | |
| tree | 4e1ae5338dbeff0371aa6b3178752d3d00d0ad29 | |
| parent | - it may be needed to change 'gatewayip' as well (diff) | |
| download | wireguard-openbsd-6f093b5d9ba81c15d7c977679ad5c2a438ed9dbe.tar.xz wireguard-openbsd-6f093b5d9ba81c15d7c977679ad5c2a438ed9dbe.zip | |
Don't display, or save via the editor 's' command, the fsize and
bsize fields for UNUSED partitions. '-R' already skipped processing
these fields for such partitions. Eliminates an XXX.
ok deraadt, "makes sense" miod@
| -rw-r--r-- | sbin/disklabel/disklabel.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index 4c601206d5e..500f42c7f15 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.c,v 1.137 2009/01/11 19:44:57 miod Exp $ */ +/* $OpenBSD: disklabel.c,v 1.138 2009/02/15 21:07:00 krw Exp $ */ /* * Copyright (c) 1987, 1993 @@ -39,7 +39,7 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.137 2009/01/11 19:44:57 miod Exp $"; +static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.138 2009/02/15 21:07:00 krw Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -986,23 +986,18 @@ display_partition(FILE *f, struct disklabel *lp, char **mp, int i, fprintf(f, "%7.7s", fstypenames[pp->p_fstype]); else fprintf(f, "%7d", pp->p_fstype); - switch (pp->p_fstype) { - - case FS_UNUSED: /* XXX */ - fprintf(f, " %5u %5u %4.4s ", - fsize, fsize * frag, ""); - break; + switch (pp->p_fstype) { case FS_BSDFFS: fprintf(f, " %5u %5u %4hu ", fsize, fsize * frag, pp->p_cpg); break; - default: fprintf(f, "%19.19s", ""); break; } + if (mp != NULL) { if (mp[i] != NULL) fprintf(f, "# %s", mp[i]); |