logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.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. libfdisk/src/bsd.c | 6 ++----
  7. 1 file changed, 2 insertions(+), 4 deletions(-)
  8. diff --git a/libfdisk/src/bsd.c b/libfdisk/src/bsd.c
  9. index 817f50c87..25e878c32 100644
  10. --- a/libfdisk/src/bsd.c
  11. +++ b/libfdisk/src/bsd.c
  12. @@ -576,8 +576,7 @@ static uint32_t ask_uint32(struct fdisk_context *cxt,
  13. {
  14. uintmax_t res;
  15. - if (fdisk_ask_number(cxt, min(dflt, (uint32_t) 1), dflt,
  16. - UINT32_MAX, mesg, &res) == 0)
  17. + if (fdisk_ask_number(cxt, !!dflt, dflt, UINT32_MAX, mesg, &res) == 0)
  18. return res;
  19. return dflt;
  20. }
  21. @@ -587,8 +586,7 @@ static uint16_t ask_uint16(struct fdisk_context *cxt,
  22. {
  23. uintmax_t res;
  24. - if (fdisk_ask_number(cxt, min(dflt, (uint16_t) 1),
  25. - dflt, UINT16_MAX, mesg, &res) == 0)
  26. + if (fdisk_ask_number(cxt, !!dflt, dflt, UINT16_MAX, mesg, &res) == 0)
  27. return res;
  28. return dflt;
  29. }
  30. --
  31. 2.20.1