logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0002-Don-t-omit-second-operand-to-conditional-operator.patch (927B)


  1. From ba4ce26feeb95b9a6e26c9db19045289c53a45cc Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Mon, 6 Sep 2021 22:38:25 -0700
  4. Subject: [PATCH] Don't omit second operand to conditional operator
  5. ---
  6. extlinux/main.c | 4 ++--
  7. 1 file changed, 2 insertions(+), 2 deletions(-)
  8. diff --git a/extlinux/main.c b/extlinux/main.c
  9. index 4967a306..04a2036b 100644
  10. --- a/extlinux/main.c
  11. +++ b/extlinux/main.c
  12. @@ -196,8 +196,8 @@ int get_geometry(int devfd, uint64_t totalbytes, struct hd_geometry *geo)
  13. what zipdisks use, so this would help if someone has a USB key that
  14. they're booting in USB-ZIP mode. */
  15. - geo->heads = opt.heads ? : 64;
  16. - geo->sectors = opt.sectors ? : 32;
  17. + geo->heads = opt.heads ? opt.heads : 64;
  18. + geo->sectors = opt.sectors ? opt.sectors : 32;
  19. geo->cylinders = totalbytes / (geo->heads * geo->sectors << SECTOR_SHIFT);
  20. geo->start = 0;
  21. --
  22. 2.32.0