Stop passing around little used and superfluous 'offset' parameter.

Just use the offset recorded/parsed in the struct mbr being used.

Can still traverse/edit extended MBRs so offset really wasn't needed.

Fewer parameters, less confusion, no functional change.

4 files changed, 43 insertions, 43 deletions

diff --git a/sbin/fdisk/cmd.c b/sbin/fdisk/cmd.c
index b7b43eaf4a5..67f72c66698 100644
--- a/sbin/fdisk/cmd.c
+++ b/sbin/fdisk/cmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.c,v 1.76 2015/03/16 23:51:50 krw Exp $	*/
+/*	$OpenBSD: cmd.c,v 1.77 2015/03/17 21:42:15 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -37,7 +37,7 @@
 int reinited;
 
 int
-Xreinit(char *args, struct mbr *mbr, struct mbr *tt, int offset)
+Xreinit(char *args, struct mbr *mbr, struct mbr *tt)
 {
 	struct dos_mbr dos_mbr;
 
@@ -50,7 +50,7 @@ Xreinit(char *args, struct mbr *mbr, struct mbr *tt, int offset)
 
 	/* Tell em we did something */
 	printf("In memory copy is initialized to:\n");
-	printf("Offset: %d\t", offset);
+	printf("Offset: %lld\t", (long long)mbr->offset);
 	MBR_print(mbr, args);
 	printf("Use 'write' to update disk.\n");
 
@@ -58,7 +58,7 @@ Xreinit(char *args, struct mbr *mbr, struct mbr *tt, int offset)
 }
 
 int
-Xdisk(char *args, struct mbr *mbr, struct mbr *tt, int offset)
+Xdisk(char *args, struct mbr *mbr, struct mbr *tt)
 {
 	int maxcyl  = 1024;
 	int maxhead = 256;
@@ -89,7 +89,7 @@ Xdisk(char *args, struct mbr *mbr, struct mbr *tt, int offset)
 }
 
 int
-Xswap(char *args, struct mbr *mbr, struct mbr *tt, int offset)
+Xswap(char *args, struct mbr *mbr, struct mbr *tt)
 {
 	const char *errstr;
 	char *from, *to;
@@ -128,7 +128,7 @@ Xswap(char *args, struct mbr *mbr, struct mbr *tt, int offset)
 }
 
 int
-Xedit(char *args, struct mbr *mbr, struct mbr *tt, int offset)
+Xedit(char *args, struct mbr *mbr, struct mbr *tt)
 {
 	const char *errstr;
 	int pn, num, ret;
@@ -142,7 +142,7 @@ Xedit(char *args, struct mbr *mbr, struct mbr *tt, int offset)
 	pp = &mbr->part[pn];
 
 	/* Edit partition type */
-	ret = Xsetpid(args, mbr, tt, offset);
+	ret = Xsetpid(args, mbr, tt);
 
 	/* Unused, so just zero out */
 	if (pp->id == DOSPTYP_UNUSED) {
@@ -189,7 +189,7 @@ Xedit(char *args, struct mbr *mbr, struct mbr *tt, int offset)
 }
 
 int
-Xsetpid(char *args, struct mbr *mbr, struct mbr *tt, int offset)
+Xsetpid(char *args, struct mbr *mbr, struct mbr *tt)
 {
 	const char *errstr;
 	int pn, num;
@@ -217,7 +217,7 @@ Xsetpid(char *args, struct mbr *mbr, struct mbr *tt, int offset)
 }
 
 int
-Xselect(char *args, struct mbr *mbr, struct mbr *tt, int offset)
+Xselect(char *args, struct mbr *mbr, struct mbr *tt)
 {
 	const char *errstr;
 	static int firstoff = 0;
@@ -257,18 +257,18 @@ Xselect(char *args, struct mbr *mbr, struct mbr *tt, int offset)
 }
 
 int
-Xprint(char *args, struct mbr *mbr, struct mbr *tt, int offset)
+Xprint(char *args, struct mbr *mbr, struct mbr *tt)
 {
 
 	DISK_printgeometry(args);
-	printf("Offset: %d\t", offset);
+	printf("Offset: %lld\t", (long long)mbr->offset);
 	MBR_print(mbr, args);
 
 	return (CMD_CONT);
 }
 
 int
-Xwrite(char *args, struct mbr *mbr, struct mbr *tt, int offset)
+Xwrite(char *args, struct mbr *mbr, struct mbr *tt)
 {
 	struct dos_mbr dos_mbr;
 	int fd, i, n;
@@ -285,8 +285,8 @@ Xwrite(char *args, struct mbr *mbr, struct mbr *tt, int offset)
 	fd = DISK_open(disk.name, O_RDWR);
 	MBR_make(mbr, &dos_mbr);
 
-	printf("Writing MBR at offset %d.\n", offset);
-	if (MBR_write(fd, offset, &dos_mbr) == -1) {
+	printf("Writing MBR at offset %lld.\n", (long long)mbr->offset);
+	if (MBR_write(fd, mbr->offset, &dos_mbr) == -1) {
 		int saved_errno = errno;
 		warn("error writing MBR");
 		close(fd);
@@ -307,25 +307,25 @@ Xwrite(char *args, struct mbr *mbr, struct mbr *tt, int offset)
 }
 
 int
-Xquit(char *args, struct mbr *mbr, struct mbr *tt, int offset)
+Xquit(char *args, struct mbr *mbr, struct mbr *tt)
 {
 	return (CMD_SAVE);
 }
 
 int
-Xabort(char *args, struct mbr *mbr, struct mbr *tt, int offset)
+Xabort(char *args, struct mbr *mbr, struct mbr *tt)
 {
 	exit(0);
 }
 
 int
-Xexit(char *args, struct mbr *mbr, struct mbr *tt, int offset)
+Xexit(char *args, struct mbr *mbr, struct mbr *tt)
 {
 	return (CMD_EXIT);
 }
 
 int
-Xhelp(char *args, struct mbr *mbr, struct mbr *tt, int offset)
+Xhelp(char *args, struct mbr *mbr, struct mbr *tt)
 {
 	int i;
 
@@ -335,7 +335,7 @@ Xhelp(char *args, struct mbr *mbr, struct mbr *tt, int offset)
 }
 
 int
-Xupdate(char *args, struct mbr *mbr, struct mbr *tt, int offset)
+Xupdate(char *args, struct mbr *mbr, struct mbr *tt)
 {
 	/* Update code */
 	memcpy(mbr->code, tt->code, sizeof(mbr->code));
@@ -345,7 +345,7 @@ Xupdate(char *args, struct mbr *mbr, struct mbr *tt, int offset)
 }
 
 int
-Xflag(char *args, struct mbr *mbr, struct mbr *tt, int offset)
+Xflag(char *args, struct mbr *mbr, struct mbr *tt)
 {
 	const char *errstr;
 	int i, pn = -1, val = -1;
@@ -386,7 +386,7 @@ Xflag(char *args, struct mbr *mbr, struct mbr *tt, int offset)
 }
 
 int
-Xmanual(char *args, struct mbr *mbr, struct mbr *tt, int offset)
+Xmanual(char *args, struct mbr *mbr, struct mbr *tt)
 {
 	char *pager = "/usr/bin/less";
 	char *p;
diff --git a/sbin/fdisk/cmd.h b/sbin/fdisk/cmd.h
index 43f8bc34e75..a6fb5466009 100644
--- a/sbin/fdisk/cmd.h
+++ b/sbin/fdisk/cmd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.h,v 1.15 2015/03/16 23:51:50 krw Exp $	*/
+/*	$OpenBSD: cmd.h,v 1.16 2015/03/17 21:42:15 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -27,25 +27,25 @@
 
 struct cmd {
 	char *cmd;
-	int (*fcn)(char *, struct mbr *, struct mbr *, int);
+	int (*fcn)(char *, struct mbr *, struct mbr *);
 	char *help;
 };
 extern struct cmd cmd_table[];
 
-int Xreinit(char *, struct mbr *, struct mbr *, int);
-int Xdisk(char *, struct mbr *, struct mbr *, int);
-int Xmanual(char *, struct mbr *, struct mbr *, int);
-int Xedit(char *, struct mbr *, struct mbr *, int);
-int Xsetpid(char *, struct mbr *, struct mbr *, int);
-int Xselect(char *, struct mbr *, struct mbr *, int);
-int Xswap(char *, struct mbr *, struct mbr *, int);
-int Xprint(char *, struct mbr *, struct mbr *, int);
-int Xwrite(char *, struct mbr *, struct mbr *, int);
-int Xexit(char *, struct mbr *, struct mbr *, int);
-int Xquit(char *, struct mbr *, struct mbr *, int);
-int Xabort(char *, struct mbr *, struct mbr *, int);
-int Xhelp(char *, struct mbr *, struct mbr *, int);
-int Xflag(char *, struct mbr *, struct mbr *, int);
-int Xupdate(char *, struct mbr *, struct mbr *, int);
+int Xreinit(char *, struct mbr *, struct mbr *);
+int Xdisk(char *, struct mbr *, struct mbr *);
+int Xmanual(char *, struct mbr *, struct mbr *);
+int Xedit(char *, struct mbr *, struct mbr *);
+int Xsetpid(char *, struct mbr *, struct mbr *);
+int Xselect(char *, struct mbr *, struct mbr *);
+int Xswap(char *, struct mbr *, struct mbr *);
+int Xprint(char *, struct mbr *, struct mbr *);
+int Xwrite(char *, struct mbr *, struct mbr *);
+int Xexit(char *, struct mbr *, struct mbr *);
+int Xquit(char *, struct mbr *, struct mbr *);
+int Xabort(char *, struct mbr *, struct mbr *);
+int Xhelp(char *, struct mbr *, struct mbr *);
+int Xflag(char *, struct mbr *, struct mbr *);
+int Xupdate(char *, struct mbr *, struct mbr *);
 
 #endif /* _CMD_H */
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index b8d49456dc7..b9da2a8394e 100644
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fdisk.c,v 1.69 2015/03/16 23:51:50 krw Exp $	*/
+/*	$OpenBSD: fdisk.c,v 1.70 2015/03/17 21:42:15 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -198,7 +198,7 @@ main(int argc, char *argv[])
 		query = "Do you wish to write new MBR?";
 	}
 	if (query && ask_yn(query))
-		Xwrite(NULL, &mbr, NULL, 0);
+		Xwrite(NULL, &mbr, NULL);
 
 	if (e_flag)
 		USER_edit(&mbr, 0, 0);
diff --git a/sbin/fdisk/user.c b/sbin/fdisk/user.c
index 082a11bfd33..e4720b640f0 100644
--- a/sbin/fdisk/user.c
+++ b/sbin/fdisk/user.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: user.c,v 1.40 2015/03/16 23:51:50 krw Exp $	*/
+/*	$OpenBSD: user.c,v 1.41 2015/03/17 21:42:15 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -102,7 +102,7 @@ again:
 		}
 
 		/* Call function */
-		st = cmd_table[i].fcn(args, &mbr, tt, offset);
+		st = cmd_table[i].fcn(args, &mbr, tt);
 
 		/* Update status */
 		if (st == CMD_EXIT)
@@ -118,7 +118,7 @@ again:
 	/* Write out MBR */
 	if (modified) {
 		if (st == CMD_SAVE) {
-			if (Xwrite(NULL, &mbr, NULL, offset) == CMD_CONT)
+			if (Xwrite(NULL, &mbr, NULL) == CMD_CONT)
 				goto again;
 			close(fd);
 		} else