linux-qubasis
linux oasis port as a qubes template
git clone https://9o.is/git/linux-qubasis.git
0003-Don-t-use-min-to-determine-if-dflt-is-non-zero.patch
(1041B)
1 From 417ef5a41b19c9cc7ccdf3002453c0fec9caa960 Mon Sep 17 00:00:00 2001
2 From: Michael Forney <mforney@mforney.org>
3 Date: Tue, 18 Jun 2019 02:31:19 -0700
4 Subject: [PATCH] Don't use min to determine if dflt is non-zero
5
6 ---
7 libfdisk/src/bsd.c | 6 ++----
8 1 file changed, 2 insertions(+), 4 deletions(-)
9
10 diff --git a/libfdisk/src/bsd.c b/libfdisk/src/bsd.c
11 index 817f50c87..25e878c32 100644
12 --- a/libfdisk/src/bsd.c
13 +++ b/libfdisk/src/bsd.c
14 @@ -576,8 +576,7 @@ static uint32_t ask_uint32(struct fdisk_context *cxt,
15 {
16 uintmax_t res;
17
18 - if (fdisk_ask_number(cxt, min(dflt, (uint32_t) 1), dflt,
19 - UINT32_MAX, mesg, &res) == 0)
20 + if (fdisk_ask_number(cxt, !!dflt, dflt, UINT32_MAX, mesg, &res) == 0)
21 return res;
22 return dflt;
23 }
24 @@ -587,8 +586,7 @@ static uint16_t ask_uint16(struct fdisk_context *cxt,
25 {
26 uintmax_t res;
27
28 - if (fdisk_ask_number(cxt, min(dflt, (uint16_t) 1),
29 - dflt, UINT16_MAX, mesg, &res) == 0)
30 + if (fdisk_ask_number(cxt, !!dflt, dflt, UINT16_MAX, mesg, &res) == 0)
31 return res;
32 return dflt;
33 }
34 --
35 2.20.1
36