diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2016-01-16 21:59:31 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2016-01-16 21:59:31 +0000 |
| commit | 3d3e9d6b831e5a78417ccc43676e2d9ac9341549 (patch) | |
| tree | a7a3de25a20880d193c2c4d6862a41bd4004dbf6 | |
| parent | 0ad1ce58f7341c8b7e1241647b8b3c8b9e809534 (diff) | |
No need to abstract malloc(), so replace new_file_media() with
malloc().
Removes last use of last used function in media.c, so unhook that
from the Makefile and remove forward declarations from media.h.
No functional change.
| -rw-r--r-- | distrib/special/pdisk/Makefile | 4 | ||||
| -rw-r--r-- | sbin/pdisk/Makefile | 4 | ||||
| -rw-r--r-- | sbin/pdisk/media.h | 8 |
3 files changed, 5 insertions, 11 deletions
diff --git a/distrib/special/pdisk/Makefile b/distrib/special/pdisk/Makefile index 88118cad048..b001e235ecc 100644 --- a/distrib/special/pdisk/Makefile +++ b/distrib/special/pdisk/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.6 2016/01/16 14:49:28 krw Exp $ +# $Id: Makefile,v 1.7 2016/01/16 21:59:30 krw Exp $ .if ${MACHINE} == "macppc" PROG= pdisk @@ -7,7 +7,7 @@ DPADD= ${LIBUTIL} CFLAGS+=-Wall SRCS= convert.c dump.c \ - file_media.c io.c media.c partition_map.c \ + io.c partition_map.c \ pdisk.c validate.c .else diff --git a/sbin/pdisk/Makefile b/sbin/pdisk/Makefile index 076e4e00f14..8f97118ea78 100644 --- a/sbin/pdisk/Makefile +++ b/sbin/pdisk/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.18 2016/01/16 14:49:28 krw Exp $ +# $Id: Makefile,v 1.19 2016/01/16 21:59:30 krw Exp $ .if ${MACHINE} == "macppc" PROG= pdisk @@ -7,7 +7,7 @@ DPADD= ${LIBUTIL} CFLAGS+=-Wall SRCS= convert.c dump.c \ - file_media.c io.c media.c partition_map.c \ + file_media.c io.c partition_map.c \ pdisk.c validate.c .else diff --git a/sbin/pdisk/media.h b/sbin/pdisk/media.h index 1ddb322e91c..3816314aab1 100644 --- a/sbin/pdisk/media.h +++ b/sbin/pdisk/media.h @@ -1,4 +1,4 @@ -/* $OpenBSD: media.h,v 1.10 2016/01/16 21:41:41 krw Exp $ */ +/* $OpenBSD: media.h,v 1.11 2016/01/16 21:59:30 krw Exp $ */ /* * media.h - @@ -78,11 +78,5 @@ struct media { /* * Forward declarations */ -/* those whose use media objects need these routines */ -long long media_total_size(MEDIA m); - -/* those who define media objects need these routines also */ -MEDIA new_media(long size); -void delete_media(MEDIA m); #endif /* __media__ */ |