Remove unused argument 'int pn' to PRT_fix_CHS(). The 'int pn'

argument to PRT_parse() then becomes unused, so remove that too.

ok henning@, otto@

4 files changed, 14 insertions, 14 deletions

diff --git a/sbin/fdisk/cmd.c b/sbin/fdisk/cmd.c
index 3e217e09cc2..735f2e64d10 100644
--- a/sbin/fdisk/cmd.c
+++ b/sbin/fdisk/cmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.c,v 1.34 2004/06/22 23:01:55 tom Exp $	*/
+/*	$OpenBSD: cmd.c,v 1.35 2004/07/13 06:00:33 tom Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -150,7 +150,7 @@ Xedit(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
 		/* Fix up off/size values */
 		PRT_fix_BN(disk, pp, pn);
 		/* Fix up CHS values for LBA */
-		PRT_fix_CHS(disk, pp, pn);
+		PRT_fix_CHS(disk, pp);
 	} else {
 		u_int m;
 
@@ -171,7 +171,7 @@ Xedit(cmd_t *cmd, disk_t *disk, mbr_t *mbr, mbr_t *tt, int offset)
 		    DO_ROUNDING : 0));
 
 		/* Fix up CHS values */
-		PRT_fix_CHS(disk, pp, pn);
+		PRT_fix_CHS(disk, pp);
 	}
 #undef EDIT
 	return (ret);
diff --git a/sbin/fdisk/mbr.c b/sbin/fdisk/mbr.c
index 35c457aeb1b..8cb711e1370 100644
--- a/sbin/fdisk/mbr.c
+++ b/sbin/fdisk/mbr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbr.c,v 1.19 2003/07/29 18:38:35 deraadt Exp $	*/
+/*	$OpenBSD: mbr.c,v 1.20 2004/07/13 06:00:33 tom Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -75,7 +75,7 @@ MBR_init(disk_t *disk, mbr_t *mbr)
 	mbr->part[3].ns += mbr->part[3].bs;
 	mbr->part[3].bs = mbr->part[0].bs + mbr->part[0].ns;
 	mbr->part[3].ns -= mbr->part[3].bs;
-	PRT_fix_CHS(disk, &mbr->part[3], 3);
+	PRT_fix_CHS(disk, &mbr->part[3]);
 	if ((mbr->part[3].shead != 1) || (mbr->part[3].ssect != 1)) {
 		/* align the partition on a cylinder boundary */
 		mbr->part[3].shead = 0;
@@ -99,7 +99,7 @@ MBR_parse(disk_t *disk, char *mbr_buf, off_t offset, off_t reloff, mbr_t *mbr)
 
 	for (i = 0; i < NDOSPART; i++)
 		PRT_parse(disk, &mbr_buf[MBR_PART_OFF + MBR_PART_SIZE * i],
-		    offset, reloff, &mbr->part[i], i);
+		    offset, reloff, &mbr->part[i]);
 }
 
 void
@@ -182,7 +182,7 @@ MBR_pcopy(disk_t *disk, mbr_t *mbr)
 	for (i = 0; i < NDOSPART; i++) {
 		PRT_parse(disk, &mbr_disk[MBR_PART_OFF +
 					 MBR_PART_SIZE * i],
-			  offset, reloff, &mbr->part[i], i);
+			  offset, reloff, &mbr->part[i]);
 		PRT_print(i, &mbr->part[i], NULL);
 	}
 }
diff --git a/sbin/fdisk/part.c b/sbin/fdisk/part.c
index c962d8507fc..1f01a2aefbc 100644
--- a/sbin/fdisk/part.c
+++ b/sbin/fdisk/part.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: part.c,v 1.37 2004/07/10 08:43:36 tom Exp $	*/
+/*	$OpenBSD: part.c,v 1.38 2004/07/13 06:00:33 tom Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -174,7 +174,7 @@ PRT_ascii_id(int id)
 
 void
 PRT_parse(disk_t *disk, void *prt, off_t offset, off_t reloff,
-    prt_t *partn, int pn)
+    prt_t *partn)
 {
 	unsigned char *p = prt;
 	off_t off;
@@ -200,7 +200,7 @@ PRT_parse(disk_t *disk, void *prt, off_t offset, off_t reloff,
 	partn->bs = getlong(p) + off;
 	partn->ns = getlong(p+4);
 
-	PRT_fix_CHS(disk, partn, pn);
+	PRT_fix_CHS(disk, partn);
 }
 
 int
@@ -330,7 +330,7 @@ PRT_fix_BN(disk_t *disk, prt_t *part, int pn)
 }
 
 void
-PRT_fix_CHS(disk_t *disk, prt_t *part, int pn)
+PRT_fix_CHS(disk_t *disk, prt_t *part)
 {
 	int spt, tpc, spc;
 	int start, end, size;
diff --git a/sbin/fdisk/part.h b/sbin/fdisk/part.h
index af200a14102..bcc13b8164e 100644
--- a/sbin/fdisk/part.h
+++ b/sbin/fdisk/part.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: part.h,v 1.11 2003/06/03 01:13:19 weingart Exp $	*/
+/*	$OpenBSD: part.h,v 1.12 2004/07/13 06:00:33 tom Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -41,7 +41,7 @@ typedef struct _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 *, 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 *);
 
@@ -49,7 +49,7 @@ void PRT_print(int, prt_t *, char *);
 void PRT_fix_BN(disk_t *, prt_t *, int);
 
 /* This does bs/ns -> CHS */
-void PRT_fix_CHS(disk_t *, prt_t *, int);
+void PRT_fix_CHS(disk_t *, prt_t *);
 
 #endif /* _PART_H */