diff options
| author |   krw <krw@openbsd.org> | 2014-03-20 13:43:32 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2014-03-20 13:43:32 +0000 |
| commit | 19304799f343e09e808c6575cc6debf43c477ff5 (patch) | |
| tree | 59bb773591bd45d8888d8efb064a0ded41ac1ae6 | |
| parent | Do not pull <sys/tree.h> unconditionally in <net/if.h>, only the address (diff) | |
| download | wireguard-openbsd-19304799f343e09e808c6575cc6debf43c477ff5.tar.xz wireguard-openbsd-19304799f343e09e808c6575cc6debf43c477ff5.zip | |
Simplify a bit of code to make sure even -Wall can see the variables
are not used uninitialized. As a bonus, make variables the same
type as the data they are trying to preserve.
| -rw-r--r-- | sbin/fdisk/part.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/sbin/fdisk/part.c b/sbin/fdisk/part.c index 4e78a056d2d..0330fa7bb82 100644 --- a/sbin/fdisk/part.c +++ b/sbin/fdisk/part.c @@ -1,4 +1,4 @@ -/* $OpenBSD: part.c,v 1.60 2014/03/20 13:18:21 krw Exp $ */ +/* $OpenBSD: part.c,v 1.61 2014/03/20 13:43:32 krw Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -223,16 +223,16 @@ void PRT_make(struct prt *partn, off_t offset, off_t reloff, void *prt) { unsigned char *p = prt; - int ecsave, scsave; - int modified = 0; off_t off; + u_int32_t ecsave, scsave; + + /* Save (and restore below) cylinder info we may fiddle with. */ + scsave = partn->scyl; + ecsave = partn->ecyl; if ((partn->scyl > 1023) || (partn->ecyl > 1023)) { - scsave = partn->scyl; - ecsave = partn->ecyl; partn->scyl = (partn->scyl > 1023)? 1023: partn->scyl; partn->ecyl = (partn->ecyl > 1023)? 1023: partn->ecyl; - modified = 1; } if ((partn->id == DOSPTYP_EXTEND) || (partn->id == DOSPTYP_EXTENDL)) off = reloff; @@ -266,10 +266,9 @@ PRT_make(struct prt *partn, off_t offset, off_t reloff, void *prt) putlong(p, partn->bs - off); putlong(p+4, partn->ns); - if (modified) { - partn->scyl = scsave; - partn->ecyl = ecsave; - } + + partn->scyl = scsave; + partn->ecyl = ecsave; } void |