diff options
author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2009-02-08 18:03:19 +0000 |
---|---|---|
committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2009-02-08 18:03:19 +0000 |
commit | d61fc84d53fe7acdd5cbd7ff2490d07fb3a6e2b9 (patch) | |
tree | ef67c7ac872a20a970eb1075c8009bbf6122e3b0 /sbin/fdisk/disk.c | |
parent | d5574f05f492a16ad88469ada5810f2cfeaa99d6 (diff) |
Eliminate excessive verbiage for 'fdisk -i' and 'fdisk -u'. Especially
the multi-line banner announcing that the MBR is being changed.
Also the listing of the partition table in 'fdisk -u'. Display a
consistant message when the MBR is written.
While here cleanup and shrink code without changing any semantics.
Started with a diff posted on tech@ by Tobias Ulmer.
"I like it" marco@ ok jsing@
Diffstat (limited to 'sbin/fdisk/disk.c')
-rw-r--r-- | sbin/fdisk/disk.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sbin/fdisk/disk.c b/sbin/fdisk/disk.c index f4c5ef49f24..6d54aaf36d4 100644 --- a/sbin/fdisk/disk.c +++ b/sbin/fdisk/disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disk.c,v 1.28 2007/04/27 11:42:44 krw Exp $ */ +/* $OpenBSD: disk.c,v 1.29 2009/02/08 18:03:18 krw Exp $ */ /* * Copyright (c) 1997, 2001 Tobias Weingartner @@ -57,13 +57,6 @@ DISK_open(char *disk, int mode) return (fd); } -int -DISK_close(int fd) -{ - - return (close(fd)); -} - /* Routine to go after the disklabel for geometry * information. This should work everywhere, but * in the land of PC, things are not always what @@ -94,7 +87,7 @@ DISK_getlabelmetrics(char *name) lm->size = dl.d_secperunit; unit_types[SECTORS].conversion = dl.d_secsize; } - DISK_close(fd); + close(fd); } return (lm); |