diff options
-rw-r--r-- | sbin/fdisk/cmd.c | 5 | ||||
-rw-r--r-- | sbin/fdisk/cmd.h | 4 | ||||
-rw-r--r-- | sbin/fdisk/disk.c | 3 | ||||
-rw-r--r-- | sbin/fdisk/part.c | 4 | ||||
-rw-r--r-- | sbin/fdisk/user.c | 4 | ||||
-rw-r--r-- | sbin/fdisk/user.h | 3 |
6 files changed, 7 insertions, 16 deletions
diff --git a/sbin/fdisk/cmd.c b/sbin/fdisk/cmd.c index da3e1b8ba72..c3c1878fe2b 100644 --- a/sbin/fdisk/cmd.c +++ b/sbin/fdisk/cmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.c,v 1.69 2014/03/20 13:18:21 krw Exp $ */ +/* $OpenBSD: cmd.c,v 1.70 2014/03/31 22:03:29 krw Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -139,7 +139,6 @@ Xswap(char *args, struct disk *disk, struct mbr *mbr, struct mbr *tt, return (ret); } - int Xedit(char *args, struct disk *disk, struct mbr *mbr, struct mbr *tt, int offset) @@ -339,7 +338,6 @@ Xabort(char *args, struct disk *disk, struct mbr *mbr, struct mbr *tt, return (CMD_CONT); } - int Xexit(char *args, struct disk *disk, struct mbr *mbr, struct mbr *tt, int offset) @@ -438,4 +436,3 @@ Xmanual(char *args, struct disk *disk, struct mbr *mbr, struct mbr *tt, signal(SIGPIPE, opipe); return (CMD_CONT); } - diff --git a/sbin/fdisk/cmd.h b/sbin/fdisk/cmd.h index 6134f706887..c4bad9fc3aa 100644 --- a/sbin/fdisk/cmd.h +++ b/sbin/fdisk/cmd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.h,v 1.12 2014/03/17 16:40:00 krw Exp $ */ +/* $OpenBSD: cmd.h,v 1.13 2014/03/31 22:03:29 krw Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -59,5 +59,3 @@ int Xflag(char *, struct disk *, struct mbr *, struct mbr *, int); int Xupdate(char *, struct disk *, struct mbr *, struct mbr *, int); #endif /* _CMD_H */ - - diff --git a/sbin/fdisk/disk.c b/sbin/fdisk/disk.c index 0150008b719..e155f1d0239 100644 --- a/sbin/fdisk/disk.c +++ b/sbin/fdisk/disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disk.c,v 1.41 2014/03/20 13:18:21 krw Exp $ */ +/* $OpenBSD: disk.c,v 1.42 2014/03/31 22:03:29 krw Exp $ */ /* * Copyright (c) 1997, 2001 Tobias Weingartner @@ -114,4 +114,3 @@ DISK_printgeometry(struct disk *disk, char *units) return (0); } - diff --git a/sbin/fdisk/part.c b/sbin/fdisk/part.c index 269ac3d5d30..74be9c53dc4 100644 --- a/sbin/fdisk/part.c +++ b/sbin/fdisk/part.c @@ -1,4 +1,4 @@ -/* $OpenBSD: part.c,v 1.64 2014/03/31 19:50:52 krw Exp $ */ +/* $OpenBSD: part.c,v 1.65 2014/03/31 22:03:29 krw Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -216,6 +216,7 @@ PRT_check_chs(struct prt *partn) } return 1; } + void PRT_make(struct prt *partn, off_t offset, off_t reloff, struct dos_partition *prt) @@ -360,4 +361,3 @@ PRT_fix_CHS(struct disk *disk, struct prt *part) part->ehead = head; part->esect = sect; } - diff --git a/sbin/fdisk/user.c b/sbin/fdisk/user.c index 64cca42e970..5df8f1110d8 100644 --- a/sbin/fdisk/user.c +++ b/sbin/fdisk/user.c @@ -1,4 +1,4 @@ -/* $OpenBSD: user.c,v 1.34 2014/03/20 13:18:21 krw Exp $ */ +/* $OpenBSD: user.c,v 1.35 2014/03/31 22:03:29 krw Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -59,7 +59,6 @@ struct cmd cmd_table[] = { {NULL, NULL, NULL} }; - int USER_init(struct disk *disk, struct mbr *tt, int preserve) { @@ -193,4 +192,3 @@ USER_print_disk(struct disk *disk) return (close(fd)); } - diff --git a/sbin/fdisk/user.h b/sbin/fdisk/user.h index 79b993e2a77..9cff12608c2 100644 --- a/sbin/fdisk/user.h +++ b/sbin/fdisk/user.h @@ -1,4 +1,4 @@ -/* $OpenBSD: user.h,v 1.9 2014/03/17 16:40:00 krw Exp $ */ +/* $OpenBSD: user.h,v 1.10 2014/03/31 22:03:29 krw Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -34,4 +34,3 @@ int USER_modify(struct disk *, struct mbr *, off_t, off_t); int USER_print_disk(struct disk *); #endif /* _USER_H */ - |