Relieve the code of an overburden of unnecessary typedef

abstraction. Call a 'struct' a 'struct' and not a pony.

No functional change.

idea ok deraadt@

13 files changed, 133 insertions, 122 deletions

diff --git a/sbin/fdisk/cmd.c b/sbin/fdisk/cmd.c
index 4c84a5286af..4dbcaed4b4e 100644
--- a/sbin/fdisk/cmd.c
+++ b/sbin/fdisk/cmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.c,v 1.60 2013/03/21 18:45:58 deraadt Exp $	*/
+/*	$OpenBSD: cmd.c,v 1.61 2014/03/07 21:56:13 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -44,7 +44,8 @@
 #include "cmd.h"
 
 int
-Xreinit(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
+Xreinit(struct cmd *cmd, struct disk *disk, struct mbr *mbr, struct mbr *tt,
+    int offset)
 {
 	char buf[DEV_BSIZE];
 
@@ -65,7 +66,8 @@ Xreinit(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
 
 /* ARGSUSED */
 int
-Xdisk(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
+Xdisk(struct cmd *cmd, struct disk *disk, struct mbr *mbr, struct mbr *tt,
+    int offset)
 {
 	int maxcyl  = 1024;
 	int maxhead = 256;
@@ -98,12 +100,13 @@ Xdisk(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
 
 /* ARGSUSED */
 int
-Xswap(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
+Xswap(struct cmd *cmd, struct disk *disk, struct mbr *mbr, struct mbr *tt,
+    int offset)
 {
 	const char *errstr;
 	char *from, *to;
 	int pf, pt, ret;
-	prt_t pp;
+	struct prt pp;
 
 	ret = CMD_CONT;
 
@@ -142,11 +145,12 @@ Xswap(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
 
 /* ARGSUSED */
 int
-Xedit(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
+Xedit(struct cmd *cmd, struct disk *disk, struct mbr *mbr, struct mbr *tt,
+    int offset)
 {
 	const char *errstr;
 	int pn, num, ret;
-	prt_t *pp;
+	struct prt *pp;
 
 	pn = (int)strtonum(cmd->args, 0, 3, &errstr);
 	if (errstr) {
@@ -204,11 +208,12 @@ Xedit(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
 
 /* ARGSUSED */
 int
-Xsetpid(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
+Xsetpid(struct cmd *cmd, struct disk *disk, struct mbr *mbr, struct mbr *tt,
+    int offset)
 {
 	const char *errstr;
 	int pn, num, ret;
-	prt_t *pp;
+	struct prt *pp;
 
 	ret = CMD_CONT;
 
@@ -235,7 +240,8 @@ Xsetpid(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
 
 /* ARGSUSED */
 int
-Xselect(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
+Xselect(struct cmd *cmd, struct disk *disk, struct mbr *mbr, struct mbr *tt,
+    int offset)
 {
 	const char *errstr;
 	static int firstoff = 0;
@@ -275,7 +281,8 @@ Xselect(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
 
 /* ARGSUSED */
 int
-Xprint(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
+Xprint(struct cmd *cmd, struct disk *disk, struct mbr *mbr, struct mbr *tt,
+    int offset)
 {
 
 	DISK_printmetrics(disk, cmd->args);
@@ -287,7 +294,8 @@ Xprint(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
 
 /* ARGSUSED */
 int
-Xwrite(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
+Xwrite(struct cmd *cmd, struct disk *disk, struct mbr *mbr, struct mbr *tt,
+    int offset)
 {
 	char mbr_buf[DEV_BSIZE];
 	int fd, i, n;
@@ -322,12 +330,8 @@ Xwrite(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
 
 /* ARGSUSED */
 int
-Xquit(cmd, disk, r, tt, offset)
-	cmd_t *cmd;
-	disk_t *disk;
-	mbr_t *r;
-	mbr_t *tt;
-	int offset;
+Xquit(struct cmd *cmd, struct disk *disk, struct mbr *mbr, struct mbr *tt,
+    int offset)
 {
 
 	/* Nothing to do here */
@@ -336,7 +340,8 @@ Xquit(cmd, disk, r, tt, offset)
 
 /* ARGSUSED */
 int
-Xabort(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
+Xabort(struct cmd *cmd, struct disk *disk, struct mbr *mbr, struct mbr *tt,
+    int offset)
 {
 	exit(0);
 
@@ -347,7 +352,8 @@ Xabort(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
 
 /* ARGSUSED */
 int
-Xexit(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
+Xexit(struct cmd *cmd, struct disk *disk, struct mbr *mbr, struct mbr *tt,
+    int offset)
 {
 
 	/* Nothing to do here */
@@ -356,9 +362,10 @@ Xexit(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
 
 /* ARGSUSED */
 int
-Xhelp(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
+Xhelp(struct cmd *cmd, struct disk *disk, struct mbr *mbr, struct mbr *tt,
+    int offset)
 {
-	cmd_table_t *cmd_table = cmd->table;
+	struct cmd_table *cmd_table = cmd->table;
 	int i;
 
 	/* Hmm, print out cmd_table here... */
@@ -369,7 +376,8 @@ Xhelp(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
 
 /* ARGSUSED */
 int
-Xupdate(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
+Xupdate(struct cmd *cmd, struct disk *disk, struct mbr *mbr, struct mbr *tt,
+    int offset)
 {
 
 	/* Update code */
@@ -381,7 +389,8 @@ Xupdate(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
 
 /* ARGSUSED */
 int
-Xflag(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
+Xflag(struct cmd *cmd, struct disk *disk, struct mbr *mbr, struct mbr *tt,
+    int offset)
 {
 	const char *errstr;
 	int i, pn = -1, val = -1;
@@ -422,7 +431,8 @@ Xflag(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
 
 /* ARGSUSED */
 int
-Xmanual(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
+Xmanual(struct cmd *cmd, struct disk *disk, struct mbr *mbr, struct mbr *tt,
+    int offset)
 {
 	char *pager = "/usr/bin/less";
 	char *p;
diff --git a/sbin/fdisk/cmd.h b/sbin/fdisk/cmd.h
index 0d2d824b8c8..d0f07ee559f 100644
--- a/sbin/fdisk/cmd.h
+++ b/sbin/fdisk/cmd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.h,v 1.9 2005/01/19 15:48:20 deraadt Exp $	*/
+/*	$OpenBSD: cmd.h,v 1.10 2014/03/07 21:56:13 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -42,36 +42,36 @@
 
 
 /* Data types */
-struct _cmd_table_t;
-typedef struct _cmd_t {
-	struct _cmd_table_t *table;
+struct cmd_table;
+struct cmd {
+	struct cmd_table *table;
 	char cmd[10];
 	char args[100];
-} cmd_t;
+};
 
-typedef struct _cmd_table_t {
+struct cmd_table {
 	char *cmd;
-	int (*fcn)(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
+	int (*fcn)(struct cmd *, struct disk *, struct mbr *, struct mbr *,
+	    int);
 	char *help;
-} cmd_table_t;
-
+};
 
 /* Prototypes */
-int Xreinit(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
-int Xdisk(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
-int Xmanual(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
-int Xedit(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
-int Xsetpid(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
-int Xselect(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
-int Xswap(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
-int Xprint(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
-int Xwrite(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
-int Xexit(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
-int Xquit(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
-int Xabort(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
-int Xhelp(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
-int Xflag(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
-int Xupdate(cmd_t *, disk_t *, mbr_t *, mbr_t *, int);
+int Xreinit(struct cmd *, struct  disk *, struct mbr *, struct mbr *, int);
+int Xdisk(struct cmd *, struct disk *, struct mbr *, struct mbr *, int);
+int Xmanual(struct cmd *, struct disk *, struct mbr *, struct mbr *, int);
+int Xedit(struct cmd *, struct disk *, struct mbr *, struct mbr *, int);
+int Xsetpid(struct cmd *, struct disk *, struct mbr *, struct mbr *, int);
+int Xselect(struct cmd *, struct disk *, struct mbr *, struct mbr *, int);
+int Xswap(struct cmd *, struct disk *, struct mbr *, struct mbr *, int);
+int Xprint(struct cmd *, struct disk *, struct mbr *, struct mbr *, int);
+int Xwrite(struct cmd *, struct disk *, struct mbr *, struct mbr *, int);
+int Xexit(struct cmd *, struct disk *, struct mbr *, struct mbr *, int);
+int Xquit(struct cmd *, struct disk *, struct mbr *, struct mbr *, int);
+int Xabort(struct cmd *, struct disk *, struct mbr *, struct mbr *, int);
+int Xhelp(struct cmd *, struct disk *, struct mbr *, struct mbr *, int);
+int Xflag(struct cmd *, struct disk *, struct mbr *, struct mbr *, int);
+int Xupdate(struct cmd *, struct disk *, struct mbr *, struct mbr *, int);
 
 #endif /* _CMD_H */
 
diff --git a/sbin/fdisk/disk.c b/sbin/fdisk/disk.c
index d14fb3b430f..f8d2c12c4eb 100644
--- a/sbin/fdisk/disk.c
+++ b/sbin/fdisk/disk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disk.c,v 1.34 2013/03/21 18:45:58 deraadt Exp $	*/
+/*	$OpenBSD: disk.c,v 1.35 2014/03/07 21:56:13 krw Exp $	*/
 
 /*
  * Copyright (c) 1997, 2001 Tobias Weingartner
@@ -42,7 +42,7 @@
 
 struct disklabel dl;
 
-DISK_metrics *DISK_getlabelmetrics(char *name);
+struct DISK_metrics *DISK_getlabelmetrics(char *name);
 
 int
 DISK_open(char *disk, int mode)
@@ -65,16 +65,16 @@ DISK_open(char *disk, int mode)
  * in the land of PC, things are not always what
  * they seem.
  */
-DISK_metrics *
+struct DISK_metrics *
 DISK_getlabelmetrics(char *name)
 {
-	DISK_metrics *lm = NULL;
+	struct DISK_metrics *lm = NULL;
 	u_int64_t sz, spc;
 	int fd;
 
 	/* Get label metrics */
 	if ((fd = DISK_open(name, O_RDONLY)) != -1) {
-		lm = malloc(sizeof(DISK_metrics));
+		lm = malloc(sizeof(struct DISK_metrics));
 		if (lm == NULL)
 			err(1, NULL);
 
@@ -114,7 +114,7 @@ DISK_getlabelmetrics(char *name)
  * geometry he/she wishes to use.
  */
 int
-DISK_getmetrics(disk_t *disk, DISK_metrics *user)
+DISK_getmetrics(struct disk *disk, struct DISK_metrics *user)
 {
 
 	disk->label = DISK_getlabelmetrics(disk->name);
@@ -141,7 +141,7 @@ DISK_getmetrics(disk_t *disk, DISK_metrics *user)
  * to indicate the units that should be used for display.
  */
 int
-DISK_printmetrics(disk_t *disk, char *units)
+DISK_printmetrics(struct disk *disk, char *units)
 {
 	const int secsize = unit_types[SECTORS].conversion;
 	double size;
diff --git a/sbin/fdisk/disk.h b/sbin/fdisk/disk.h
index 0ffd479c6b0..1f765f7c3f1 100644
--- a/sbin/fdisk/disk.h
+++ b/sbin/fdisk/disk.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disk.h,v 1.11 2010/06/30 22:53:41 krw Exp $	*/
+/*	$OpenBSD: disk.h,v 1.12 2014/03/07 21:56:13 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -29,23 +29,23 @@
 #define _DISK_H
 
 /* Data types */
-typedef struct _DISK_metrics {
+struct DISK_metrics {
 	u_int32_t cylinders;
 	u_int32_t heads;
 	u_int32_t sectors;
 	u_int32_t size;
-} DISK_metrics;
+};
 
-typedef struct _disk_t {
+struct disk {
 	char *name;
-	DISK_metrics *label;
-	DISK_metrics *real;
-} disk_t;
+	struct DISK_metrics *label;
+	struct DISK_metrics *real;
+};
 
 /* Prototypes */
 int DISK_open(char *, int);
-int DISK_getmetrics(disk_t *, DISK_metrics *);
-int DISK_printmetrics(disk_t *, char *);
+int DISK_getmetrics(struct disk *, struct DISK_metrics *);
+int DISK_printmetrics(struct disk *, char *);
 
 extern struct disklabel dl;
 
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index dfd2cf78a92..a139bfc9378 100644
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fdisk.c,v 1.56 2014/03/06 17:39:23 jmc Exp $	*/
+/*	$OpenBSD: fdisk.c,v 1.57 2014/03/07 21:56:13 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -71,15 +71,15 @@ main(int argc, char *argv[])
 	int ch, fd, error;
 	int i_flag = 0, m_flag = 0, u_flag = 0;
 	int c_arg = 0, h_arg = 0, s_arg = 0;
-	disk_t disk;
+	struct disk disk;
 	u_int32_t l_arg = 0;
-	DISK_metrics *usermetrics;
+	struct DISK_metrics *usermetrics;
 #ifdef HAS_MBR
 	char *mbrfile = _PATH_MBR;
 #else
 	char *mbrfile = NULL;
 #endif
-	mbr_t mbr;
+	struct mbr mbr;
 	char mbr_buf[DEV_BSIZE];
 
 	while ((ch = getopt(argc, argv, "ieuf:c:h:s:l:y")) != -1) {
@@ -138,7 +138,7 @@ main(int argc, char *argv[])
 
 	/* Put in supplied geometry if there */
 	if (c_arg | h_arg | s_arg) {
-		usermetrics = malloc(sizeof(DISK_metrics));
+		usermetrics = malloc(sizeof(struct DISK_metrics));
 		if (usermetrics != NULL) {
 			if (c_arg && h_arg && s_arg) {
 				usermetrics->cylinders = c_arg;
@@ -150,7 +150,7 @@ main(int argc, char *argv[])
 		}
 	} else if (l_arg) {
 		/* Force into LBA mode */
-		usermetrics = malloc(sizeof(DISK_metrics));
+		usermetrics = malloc(sizeof(struct DISK_metrics));
 		if (usermetrics != NULL) {
 			usermetrics->cylinders = l_arg / 64;
 			usermetrics->heads = 1;
diff --git a/sbin/fdisk/mbr.c b/sbin/fdisk/mbr.c
index 45eeda9c852..c0330c88b4b 100644
--- a/sbin/fdisk/mbr.c
+++ b/sbin/fdisk/mbr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbr.c,v 1.32 2014/02/05 03:51:07 krw Exp $	*/
+/*	$OpenBSD: mbr.c,v 1.33 2014/03/07 21:56:13 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -45,7 +45,7 @@
 
 
 void
-MBR_init(disk_t *disk, mbr_t *mbr)
+MBR_init(struct disk *disk, struct mbr *mbr)
 {
 	daddr_t i;
 	u_int64_t adj;
@@ -107,7 +107,8 @@ MBR_init(disk_t *disk, mbr_t *mbr)
 }
 
 void
-MBR_parse(disk_t *disk, char *mbr_buf, off_t offset, off_t reloff, mbr_t *mbr)
+MBR_parse(struct disk *disk, char *mbr_buf, off_t offset, off_t reloff,
+    struct mbr *mbr)
 {
 	int i;
 
@@ -122,7 +123,7 @@ MBR_parse(disk_t *disk, char *mbr_buf, off_t offset, off_t reloff, mbr_t *mbr)
 }
 
 void
-MBR_make(mbr_t *mbr, char *mbr_buf)
+MBR_make(struct mbr *mbr, char *mbr_buf)
 {
 	int i;
 
@@ -135,7 +136,7 @@ MBR_make(mbr_t *mbr, char *mbr_buf)
 }
 
 void
-MBR_print(mbr_t *mbr, char *units)
+MBR_print(struct mbr *mbr, char *units)
 {
 	int i;
 
@@ -235,10 +236,10 @@ done:
  * to the supplied mbr structure
  */
 void
-MBR_pcopy(disk_t *disk, mbr_t *mbr)
+MBR_pcopy(struct disk *disk, struct mbr *mbr)
 {
 	int i, fd, error, offset = 0, reloff = 0;
-	mbr_t mbrd;
+	struct mbr mbrd;
 	char mbr_disk[DEV_BSIZE];
 
 	fd = DISK_open(disk->name, O_RDONLY);
diff --git a/sbin/fdisk/mbr.h b/sbin/fdisk/mbr.h
index 32273050f5c..98c98c24779 100644
--- a/sbin/fdisk/mbr.h
+++ b/sbin/fdisk/mbr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbr.h,v 1.12 2013/03/21 18:37:07 deraadt Exp $	*/
+/*	$OpenBSD: mbr.h,v 1.13 2014/03/07 21:56:13 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -38,23 +38,23 @@
 
 
 /* MBR type */
-typedef struct _mbr_t {
+struct mbr {
 	off_t reloffset;
 	off_t offset;
 	unsigned char code[MBR_CODE_SIZE];
-	prt_t part[NDOSPART];
+	struct prt part[NDOSPART];
 	unsigned short signature;
-} mbr_t;
+};
 
 /* Prototypes */
 void MBR_print_disk(char *);
-void MBR_print(mbr_t *, char *);
-void MBR_parse(disk_t *, char *, off_t, off_t, mbr_t *);
-void MBR_make(mbr_t *, char *);
-void MBR_init(disk_t *, mbr_t *);
+void MBR_print(struct mbr *, char *);
+void MBR_parse(struct disk *, char *, off_t, off_t, struct mbr *);
+void MBR_make(struct mbr *, char *);
+void MBR_init(struct disk *, struct mbr *);
 int MBR_read(int, off_t, char *);
 int MBR_write(int, off_t, char *);
-void MBR_pcopy(disk_t *, mbr_t *);
+void MBR_pcopy(struct disk *, struct mbr *);
 
 /* Sanity check */
 #include <sys/param.h>
diff --git a/sbin/fdisk/misc.c b/sbin/fdisk/misc.c
index f3100828d99..c39d3339c26 100644
--- a/sbin/fdisk/misc.c
+++ b/sbin/fdisk/misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.c,v 1.32 2013/11/22 04:12:47 deraadt Exp $	*/
+/*	$OpenBSD: misc.c,v 1.33 2014/03/07 21:56:13 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -65,7 +65,7 @@ unit_lookup(char *units)
 }
 
 int
-ask_cmd(cmd_t *cmd)
+ask_cmd(struct cmd *cmd)
 {
 	char lbuf[100], *cp, *buf;
 	size_t lbuflen;
@@ -235,7 +235,7 @@ putlong(void *p, u_int32_t l)
  * adapted from sbin/disklabel/editor.c
  */
 u_int32_t
-getuint(disk_t *disk, char *prompt, u_int32_t oval, u_int32_t maxval)
+getuint(struct disk *disk, char *prompt, u_int32_t oval, u_int32_t maxval)
 {
 	char buf[BUFSIZ], *endptr, *p, operator = '\0';
 	size_t n;
diff --git a/sbin/fdisk/misc.h b/sbin/fdisk/misc.h
index c94bbac0c32..56c0e2d254b 100644
--- a/sbin/fdisk/misc.h
+++ b/sbin/fdisk/misc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.h,v 1.18 2013/03/21 18:45:58 deraadt Exp $	*/
+/*	$OpenBSD: misc.h,v 1.19 2014/03/07 21:56:13 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -47,7 +47,7 @@ extern struct unit_type unit_types[];
 
 /* Prototypes */
 int unit_lookup(char *);
-int ask_cmd(cmd_t *);
+int ask_cmd(struct cmd *);
 int ask_num(const char *, int, int, int);
 int ask_pid(int);
 int ask_yn(const char *);
@@ -55,7 +55,7 @@ u_int16_t getshort(void *);
 u_int32_t getlong(void *);
 void putshort(void *, u_int16_t);
 void putlong(void *, u_int32_t);
-u_int32_t getuint(disk_t *, char *, u_int32_t, u_int32_t);
+u_int32_t getuint(struct disk *, char *, u_int32_t, u_int32_t);
 
 #endif /* _MISC_H */
 
diff --git a/sbin/fdisk/part.c b/sbin/fdisk/part.c
index f157cf028d1..8bbc94c1a66 100644
--- a/sbin/fdisk/part.c
+++ b/sbin/fdisk/part.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: part.c,v 1.53 2013/03/21 18:45:58 deraadt Exp $	*/
+/*	$OpenBSD: part.c,v 1.54 2014/03/07 21:56:13 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -38,7 +38,7 @@
 #include "misc.h"
 #include "mbr.h"
 
-int	PRT_check_chs(prt_t *partn);
+int	PRT_check_chs(struct prt *partn);
 
 static const struct part_type {
 	int	type;
@@ -178,8 +178,8 @@ PRT_ascii_id(int id)
 }
 
 void
-PRT_parse(disk_t *disk, void *prt, off_t offset, off_t reloff,
-    prt_t *partn)
+PRT_parse(struct disk *disk, void *prt, off_t offset, off_t reloff,
+    struct prt *partn)
 {
 	unsigned char *p = prt;
 	off_t off;
@@ -209,7 +209,7 @@ PRT_parse(disk_t *disk, void *prt, off_t offset, off_t reloff,
 }
 
 int
-PRT_check_chs(prt_t *partn)
+PRT_check_chs(struct prt *partn)
 {
 	if ( (partn->shead > 255) ||
 		(partn->ssect >63) ||
@@ -223,7 +223,7 @@ PRT_check_chs(prt_t *partn)
 	return 1;
 }
 void
-PRT_make(prt_t *partn, off_t offset, off_t reloff, void *prt)
+PRT_make(struct prt *partn, off_t offset, off_t reloff, void *prt)
 {
 	unsigned char *p = prt;
 	int ecsave, scsave;
@@ -276,7 +276,7 @@ PRT_make(prt_t *partn, off_t offset, off_t reloff, void *prt)
 }
 
 void
-PRT_print(int num, prt_t *partn, char *units)
+PRT_print(int num, struct prt *partn, char *units)
 {
 	double size;
 	int i;
@@ -301,7 +301,7 @@ PRT_print(int num, prt_t *partn, char *units)
 }
 
 void
-PRT_fix_BN(disk_t *disk, prt_t *part, int pn)
+PRT_fix_BN(struct disk *disk, struct prt *part, int pn)
 {
 	u_int32_t spt, tpc, spc;
 	u_int32_t start = 0;
@@ -335,7 +335,7 @@ PRT_fix_BN(disk_t *disk, prt_t *part, int pn)
 }
 
 void
-PRT_fix_CHS(disk_t *disk, prt_t *part)
+PRT_fix_CHS(struct disk *disk, struct prt *part)
 {
 	u_int32_t spt, tpc, spc;
 	u_int32_t start, end, size;
diff --git a/sbin/fdisk/part.h b/sbin/fdisk/part.h
index adcd6f556aa..a26a0b992e4 100644
--- a/sbin/fdisk/part.h
+++ b/sbin/fdisk/part.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: part.h,v 1.13 2004/08/03 09:22:03 otto Exp $	*/
+/*	$OpenBSD: part.h,v 1.14 2014/03/07 21:56:13 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -29,27 +29,27 @@
 #define _PART_H
 
 /* Partition type */
-typedef struct _prt_t {
+struct prt {
 	u_int32_t shead, scyl, ssect;
 	u_int32_t ehead, ecyl, esect;
 	u_int32_t bs;
 	u_int32_t ns;
 	unsigned char flag;
 	unsigned char id;
-} prt_t;
+};
 
 /* Prototypes */
 void	PRT_printall(void);
 const char *PRT_ascii_id(int);
-void PRT_parse(disk_t *, void *, off_t, off_t, prt_t *);
-void PRT_make(prt_t *, off_t, off_t, void *);
-void PRT_print(int, prt_t *, char *);
+void PRT_parse(struct disk *, void *, off_t, off_t, struct prt *);
+void PRT_make(struct prt *, off_t, off_t, void *);
+void PRT_print(int, struct prt *, char *);
 
 /* This does CHS -> bs/ns */
-void PRT_fix_BN(disk_t *, prt_t *, int);
+void PRT_fix_BN(struct disk *, struct prt *, int);
 
 /* This does bs/ns -> CHS */
-void PRT_fix_CHS(disk_t *, prt_t *);
+void PRT_fix_CHS(struct disk *, struct prt *);
 
 #endif /* _PART_H */
 
diff --git a/sbin/fdisk/user.c b/sbin/fdisk/user.c
index 5ebed82c1c3..74676ed2c6b 100644
--- a/sbin/fdisk/user.c
+++ b/sbin/fdisk/user.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: user.c,v 1.26 2013/03/21 18:45:58 deraadt Exp $	*/
+/*	$OpenBSD: user.c,v 1.27 2014/03/07 21:56:13 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -43,7 +43,7 @@
 
 
 /* Our command table */
-static cmd_table_t cmd_table[] = {
+static struct cmd_table cmd_table[] = {
 	{"help",   Xhelp,	"Command help list"},
 	{"manual", Xmanual,	"Show entire OpenBSD man page for fdisk"},
 	{"reinit", Xreinit,	"Re-initialize loaded MBR (to defaults)"},
@@ -64,7 +64,7 @@ static cmd_table_t cmd_table[] = {
 
 
 int
-USER_init(disk_t *disk, mbr_t *tt, int preserve)
+USER_init(struct disk *disk, struct mbr *tt, int preserve)
 {
 	char *query;
 
@@ -85,12 +85,12 @@ USER_init(disk_t *disk, mbr_t *tt, int preserve)
 int modified;
 
 int
-USER_modify(disk_t *disk, mbr_t *tt, off_t offset, off_t reloff)
+USER_modify(struct disk *disk, struct mbr *tt, off_t offset, off_t reloff)
 {
 	static int editlevel;
 	char mbr_buf[DEV_BSIZE];
-	mbr_t mbr;
-	cmd_t cmd;
+	struct mbr mbr;
+	struct cmd cmd;
 	int i, st, fd, error;
 
 	/* One level deeper */
@@ -167,12 +167,12 @@ done:
 }
 
 int
-USER_print_disk(disk_t *disk)
+USER_print_disk(struct disk *disk)
 {
 	off_t offset, firstoff;
 	int fd, i, error;
 	char mbr_buf[DEV_BSIZE];
-	mbr_t mbr;
+	struct mbr mbr;
 
 	fd = DISK_open(disk->name, O_RDONLY);
 	offset = firstoff = 0;
diff --git a/sbin/fdisk/user.h b/sbin/fdisk/user.h
index 92d42efde74..2726e4bb11f 100644
--- a/sbin/fdisk/user.h
+++ b/sbin/fdisk/user.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: user.h,v 1.7 2003/06/03 01:13:19 weingart Exp $	*/
+/*	$OpenBSD: user.h,v 1.8 2014/03/07 21:56:13 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -32,9 +32,9 @@
 #include "mbr.h"
 
 /* Prototypes */
-int USER_init(disk_t *, mbr_t *, int);
-int USER_modify(disk_t *, mbr_t *, off_t, off_t);
-int USER_print_disk(disk_t *);
+int USER_init(struct disk *, struct mbr *, int);
+int USER_modify(struct disk *, struct mbr *, off_t, off_t);
+int USER_print_disk(struct disk *);
 
 #endif /* _USER_H */