No need to assign dl.d_nsectors to disk.dk_sectors twice.

Two statements on one line may have seemed clever but now it's
just confusing.

No functional change.

diff --git a/sbin/fdisk/disk.c b/sbin/fdisk/disk.c
index 6819518..c505a87 100644 (file)
--- a/sbin/fdisk/disk.c
+++ b/sbin/fdisk/disk.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: disk.c,v 1.73 2021/09/13 15:07:51 krw Exp $   */
+/*     $OpenBSD: disk.c,v 1.74 2021/10/10 15:34:21 krw Exp $   */
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -71,7 +71,6 @@ DISK_open(const char *name, const int oflags)
                disk.dk_size = DL_BLKTOSEC(&dl, sz);
                disk.dk_sectors = DL_BLKTOSEC(&dl, disk.dk_sectors);
        } else {
-               disk.dk_sectors = dl.d_nsectors;
                disk.dk_cylinders = dl.d_ncylinders;
                disk.dk_heads = dl.d_ntracks;
                disk.dk_sectors = dl.d_nsectors;

diff --git a/sbin/fdisk/part.c b/sbin/fdisk/part.c
index ee1c55e..cd0ecaa 100644 (file)
--- a/sbin/fdisk/part.c
+++ b/sbin/fdisk/part.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: part.c,v 1.107 2021/09/13 15:07:51 krw Exp $  */
+/*     $OpenBSD: part.c,v 1.108 2021/10/10 15:34:21 krw Exp $  */
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -437,16 +437,20 @@ PRT_fix_CHS(struct prt *prt)
        size = prt->prt_ns;
        end = (start + size) - 1;
 
-       cyl = (start / spc); start -= (cyl * spc);
-       head = (start / spt); start -= (head * spt);
+       cyl = (start / spc);
+       start -= (cyl * spc);
+       head = (start / spt);
+       start -= (head * spt);
        sect = (start + 1);
 
        prt->prt_scyl = cyl;
        prt->prt_shead = head;
        prt->prt_ssect = sect;
 
-       cyl = (end / spc); end -= (cyl * spc);
-       head = (end / spt); end -= (head * spt);
+       cyl = (end / spc);
+       end -= (cyl * spc);
+       head = (end / spt);
+       end -= (head * spt);
        sect = (end + 1);
 
        prt->prt_ecyl = cyl;