summaryrefslogtreecommitdiff
path: root/sbin/fdisk/gpt.c
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2022-04-19 17:30:37 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2022-04-19 17:30:37 +0000
commit88d167c364d28c08d352014b10a0c121477b6fe8 (patch)
tree26c1bf3efb6888943fbdae901cabbb24e463f57e /sbin/fdisk/gpt.c
parent0342523c10605721db02e72b77ba700ab134c40e (diff)
Eliminate superfluous intermediate variables 'pncnt' now that
gh.gh_part_num does not need a letoh32(). No functional change.
Diffstat (limited to 'sbin/fdisk/gpt.c')
-rw-r--r--sbin/fdisk/gpt.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/sbin/fdisk/gpt.c b/sbin/fdisk/gpt.c
index fbcb7fe6ad0..8f91536a237 100644
--- a/sbin/fdisk/gpt.c
+++ b/sbin/fdisk/gpt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gpt.c,v 1.66 2022/04/18 17:32:16 krw Exp $ */
+/* $OpenBSD: gpt.c,v 1.67 2022/04/19 17:30:36 krw Exp $ */
/*
* Copyright (c) 2015 Markus Muller <mmu@grummel.net>
* Copyright (c) 2015 Kenneth R Westerback <krw@openbsd.org>
@@ -427,13 +427,12 @@ int
find_partition(const uint8_t *beuuid)
{
struct uuid uuid, gp_type;
- unsigned int pn, pncnt;
+ unsigned int pn;
uuid_dec_be(beuuid, &uuid);
uuid_enc_le(&gp_type, &uuid);
- pncnt = gh.gh_part_num;
- for (pn = 0; pn < pncnt; pn++) {
+ for (pn = 0; pn < gh.gh_part_num; pn++) {
if (uuid_compare(&gp[pn].gp_type, &gp_type, NULL) == 0)
return pn;
}
@@ -446,17 +445,16 @@ add_partition(const uint8_t *beuuid, const char *name, uint64_t sectors)
struct uuid uuid, gp_type;
int rslt;
uint64_t end, freesectors, gpbytes, start;
- uint32_t status, pn, pncnt;
+ uint32_t status, pn;
uuid_dec_be(beuuid, &uuid);
uuid_enc_le(&gp_type, &uuid);
- pncnt = gh.gh_part_num;
- for (pn = 0; pn < pncnt; pn++) {
+ for (pn = 0; pn < gh.gh_part_num; pn++) {
if (uuid_is_nil(&gp[pn].gp_type, NULL))
break;
}
- if (pn == pncnt)
+ if (pn == gh.gh_part_num)
goto done;
rslt = lba_free(&start, &end);
@@ -497,7 +495,7 @@ add_partition(const uint8_t *beuuid, const char *name, uint64_t sectors)
return 0;
done:
- if (pn != pncnt)
+ if (pn != gh.gh_part_num)
memset(&gp[pn], 0, sizeof(gp[pn]));
printf("unable to add %s\n", name);
return -1;