diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2022-03-16 17:03:14 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2022-03-16 17:03:14 +0000 |
| commit | dce762d7f9f42d4fffdfece21e7b56e5d750ec13 (patch) | |
| tree | 191c482acc7ca157c4c77e5a2cb6f14ddd775207 /sbin | |
| parent | e56c9e28c319bd905c079725f1475ae2a7f98fcd (diff) | |
The 'status' parameter to uuid_* functions is uint32_t, not int.
No intentional functional change.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/fdisk/cmd.c | 6 | ||||
| -rw-r--r-- | sbin/fdisk/gpt.c | 7 | ||||
| -rw-r--r-- | sbin/fdisk/part.c | 7 |
3 files changed, 11 insertions, 9 deletions
diff --git a/sbin/fdisk/cmd.c b/sbin/fdisk/cmd.c index 673c7d08828..2557ddc117e 100644 --- a/sbin/fdisk/cmd.c +++ b/sbin/fdisk/cmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.c,v 1.153 2022/03/15 17:59:39 krw Exp $ */ +/* $OpenBSD: cmd.c,v 1.154 2022/03/16 17:03:13 krw Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -277,7 +277,7 @@ gsetpid(const int pn) { struct uuid gp_type, gp_guid; struct gpt_partition *gg; - int status; + uint32_t status; gg = &gp[pn]; @@ -606,7 +606,7 @@ ask_uuid(const struct uuid *olduuid) static struct uuid uuid; char lbuf[100]; char *dflt = NULL; - int status; + uint32_t status; int num = 0; uuid = *olduuid; diff --git a/sbin/fdisk/gpt.c b/sbin/fdisk/gpt.c index dac474b8544..d802d7ae55b 100644 --- a/sbin/fdisk/gpt.c +++ b/sbin/fdisk/gpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gpt.c,v 1.60 2022/03/15 17:59:39 krw Exp $ */ +/* $OpenBSD: gpt.c,v 1.61 2022/03/16 17:03:13 krw Exp $ */ /* * Copyright (c) 2015 Markus Muller <mmu@grummel.net> * Copyright (c) 2015 Kenneth R Westerback <krw@openbsd.org> @@ -307,7 +307,8 @@ GPT_print(const char *units, const int verbosity) const int secsize = dl.d_secsize; char *guidstr = NULL; double size; - int i, status; + int i; + uint32_t status; #ifdef DEBUG char *p; @@ -392,7 +393,7 @@ GPT_print_part(const int n, const char *units, const int verbosity) char *guidstr = NULL; double size; uint64_t sectors; - int status; + uint32_t status; uuid_dec_le(&partn->gp_type, &guid); sectors = letoh64(partn->gp_lba_end) - letoh64(partn->gp_lba_start) + 1; diff --git a/sbin/fdisk/part.c b/sbin/fdisk/part.c index d21b4e48f08..ff50a423a22 100644 --- a/sbin/fdisk/part.c +++ b/sbin/fdisk/part.c @@ -1,4 +1,4 @@ -/* $OpenBSD: part.c,v 1.121 2022/03/15 17:59:39 krw Exp $ */ +/* $OpenBSD: part.c,v 1.122 2022/03/16 17:03:13 krw Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -463,7 +463,7 @@ PRT_uuid_to_typename(const struct uuid *uuid) static char typename[UUID_STR_LEN + 1]; const struct gpt_type *gt; char *uuidstr; - int status; + uint32_t status; memset(typename, 0, sizeof(typename)); @@ -496,7 +496,8 @@ struct uuid * PRT_type_to_uuid(const int type) { static struct uuid guid; - int i, entries, status = uuid_s_ok; + int i, entries; + uint32_t status = uuid_s_ok; memset(&guid, 0, sizeof(guid)); |