oasis

commit: 9dcf0b83d500d46ac0b79d3a5694925202867c6b
parent aec578b990f5433fbd5fdbadad25bd7e460528bb
Author: Michael Forney <mforney@mforney.org>
Date:   Tue, 22 Sep 2020 20:59:01 -0700

util-linux: Fix one more instance conditional operator with omitted second argument

Diffstat:
M
pkg/util-linux/patch/0001-Don-t-omit-second-operand-to-operator.patch
28
+++++++++++++++++++++-------
M
pkg/util-linux/ver
2
+-

2 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/pkg/util-linux/patch/0001-Don-t-omit-second-operand-to-operator.patch b/pkg/util-linux/patch/0001-Don-t-omit-second-operand-to-operator.patch
@@ -1,15 +1,16 @@
-From 2087e89a262f9655f13878f175ad019ed3578d01 Mon Sep 17 00:00:00 2001
+From 7af1a37609261fe88626d8f7e7a4b45d972ec8e0 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Tue, 18 Jun 2019 01:38:53 -0700
 Subject: [PATCH] Don't omit second operand to `?` operator
 
 ---
- libfdisk/src/bsd.c | 2 +-
- libfdisk/src/dos.c | 2 +-
- libfdisk/src/gpt.c | 2 +-
- libfdisk/src/sgi.c | 2 +-
- libfdisk/src/sun.c | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
+ libfdisk/src/bsd.c      | 2 +-
+ libfdisk/src/dos.c      | 2 +-
+ libfdisk/src/gpt.c      | 2 +-
+ libfdisk/src/parttype.c | 2 +-
+ libfdisk/src/sgi.c      | 2 +-
+ libfdisk/src/sun.c      | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/libfdisk/src/bsd.c b/libfdisk/src/bsd.c
 index a7e2791a7..c31a29156 100644
@@ -50,6 +51,19 @@ index 66520c51d..dbd240617 100644
  }
  
  static void gpt_entry_set_type(struct gpt_entry *e, struct gpt_guid *uuid)
+diff --git a/libfdisk/src/parttype.c b/libfdisk/src/parttype.c
+index e3eb0cffa..c8f494971 100644
+--- a/libfdisk/src/parttype.c
++++ b/libfdisk/src/parttype.c
+@@ -470,7 +470,7 @@ struct fdisk_parttype *fdisk_label_advparse_parttype(
+ 
+ 	if (res)
+ 		DBG(PARTTYPE, ul_debugobj(res, "returns parsed '%s' [%s] partition type",
+-				res->name, res->typestr ? : ""));
++				res->name, res->typestr ? res->typestr : ""));
+ 	return res;
+ }
+ 
 diff --git a/libfdisk/src/sgi.c b/libfdisk/src/sgi.c
 index 6b4b5d116..14c7ea9b7 100644
 --- a/libfdisk/src/sgi.c
diff --git a/pkg/util-linux/ver b/pkg/util-linux/ver
@@ -1 +1 @@
-2.36 r0
+2.36 r1