diff options
| author | Todd T. Fries <todd@cvs.openbsd.org> | 2002-06-09 08:13:10 +0000 |
|---|---|---|
| committer | Todd T. Fries <todd@cvs.openbsd.org> | 2002-06-09 08:13:10 +0000 |
| commit | 3ed8b10a8df515c0cb5a2a6a0962c67f1c697164 (patch) | |
| tree | 16644eb4e4232e2d2cd65fc342c5dbaafdc4e136 /sbin/disklabel | |
| parent | c021608bd50b74de1b8074e336f7adad03b1c7d8 (diff) | |
rm trailing whitespace
Diffstat (limited to 'sbin/disklabel')
| -rw-r--r-- | sbin/disklabel/disklabel.c | 10 | ||||
| -rw-r--r-- | sbin/disklabel/editor.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index be2f6c2bd52..189596b9de7 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.c,v 1.74 2002/05/22 08:21:01 deraadt Exp $ */ +/* $OpenBSD: disklabel.c,v 1.75 2002/06/09 08:13:05 todd Exp $ */ /* * Copyright (c) 1987, 1993 @@ -43,7 +43,7 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.74 2002/05/22 08:21:01 deraadt Exp $"; +static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.75 2002/06/09 08:13:05 todd Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -417,7 +417,7 @@ writelabel(f, boot, lp) struct partition *pp = &lp->d_partitions[2]; /* - * If OpenBSD DOS partition is missing, or if + * If OpenBSD DOS partition is missing, or if * the label to be written is not within partition, * prompt first. Need to allow this in case operator * wants to convert the drive for dedicated use. @@ -953,7 +953,7 @@ makedisktab(f, lp) (void)fprintf(f, "o%c#%u:", c, pp->p_offset); if (pp->p_fstype != FS_UNUSED) { if ((unsigned) pp->p_fstype < FSMAXTYPES) - (void)fprintf(f, "t%c=%s:", c, + (void)fprintf(f, "t%c=%s:", c, fstypenames[pp->p_fstype]); else (void)fprintf(f, "t%c=unknown%d:", @@ -1077,7 +1077,7 @@ display_partition(f, lp, mp, i, unit, width) else putc(' ', f); fprintf(f, "- %u", - (pp->p_offset + + (pp->p_offset + pp->p_size + lp->d_secpercyl - 1) / lp->d_secpercyl - 1); if ((pp->p_offset + pp->p_size) % lp->d_secpercyl) diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c index 3bcdb375d83..583747ee0ba 100644 --- a/sbin/disklabel/editor.c +++ b/sbin/disklabel/editor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: editor.c,v 1.80 2002/05/22 08:21:01 deraadt Exp $ */ +/* $OpenBSD: editor.c,v 1.81 2002/06/09 08:13:05 todd Exp $ */ /* * Copyright (c) 1997-2000 Todd C. Miller <Todd.Miller@courtesan.com> @@ -28,7 +28,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: editor.c,v 1.80 2002/05/22 08:21:01 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: editor.c,v 1.81 2002/06/09 08:13:05 todd Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -1772,7 +1772,7 @@ editor_countfree(lp, freep) for (i = 0; i < lp->d_npartitions; i++) { pp = &lp->d_partitions[i]; if (pp->p_fstype != FS_UNUSED && pp->p_fstype != FS_BOOT && - pp->p_size > 0 && + pp->p_size > 0 && pp->p_offset + pp->p_size <= ending_sector && pp->p_offset >= starting_sector) *freep -= pp->p_size; @@ -2031,7 +2031,7 @@ mpsave(lp, mp, cdev, fstabfile) } bdev[strlen(bdev) - 1] = '\0'; - /* Sort mountpoints so we don't try to mount /usr/local before /usr */ + /* Sort mountpoints so we don't try to mount /usr/local before /usr */ qsort((void *)mi, MAXPARTITIONS, sizeof(struct mountinfo), micmp); if ((fp = fopen(fstabfile, "w")) == NULL) @@ -2360,7 +2360,7 @@ get_geometry(f, dgpp, bgpp) struct disklabel **bgpp; { #ifdef CPU_BIOS - int mib[4]; + int mib[4]; size_t size; dev_t devno; bios_diskinfo_t di; |