diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2016-01-18 17:57:36 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2016-01-18 17:57:36 +0000 |
| commit | 1f0673e8309d3a4c43d6de1aebb4e122998706b6 (patch) | |
| tree | 1d9f442c27b9c6e4e48c97ddcddb76d5f7bc1921 /sbin/pdisk/partition_map.h | |
| parent | badd3ba1cb98180755713addf8b0b99346ea7b74 (diff) | |
struct file_media had 1 field left. And one place where struct
file_media was actually stored. So move the last field (fd) into
the place formerly used to store pointer to the instance. As a
result we can just pass fd's around rather than pointers to a struct
containing a fd.
close_file_media() becomes empty but for a close(). So just use
close() and nuke close_file_media().
Diffstat (limited to 'sbin/pdisk/partition_map.h')
| -rw-r--r-- | sbin/pdisk/partition_map.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/pdisk/partition_map.h b/sbin/pdisk/partition_map.h index 5706d0bd4fd..d8d86b1b6cb 100644 --- a/sbin/pdisk/partition_map.h +++ b/sbin/pdisk/partition_map.h @@ -1,4 +1,4 @@ -/* $OpenBSD: partition_map.h,v 1.18 2016/01/18 00:04:36 krw Exp $ */ +/* $OpenBSD: partition_map.h,v 1.19 2016/01/18 17:57:35 krw Exp $ */ /* * partition_map.h - partition map routines @@ -34,11 +34,11 @@ #include "file_media.h" struct partition_map_header { - struct file_media *m; char *name; struct partition_map * disk_order; struct partition_map * base_order; struct block0 *misc; + int fd; int writable; int changed; int written; |