1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
From b77a4eb06db5c9ec06dfb8386364a5966bbcb1a8 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 7 Jul 2019 21:53:16 -0700
Subject: [PATCH] Don't omit second operand to '?' operator
---
src/kd_ioctl.c | 2 +-
src/open.c | 5 +++--
src/prctl.c | 9 ++++-----
src/strace.c | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/kd_ioctl.c b/src/kd_ioctl.c
index eadc1a457..35a89ffed 100644
--- a/src/kd_ioctl.c
+++ b/src/kd_ioctl.c
@@ -449,7 +449,7 @@ kd_kbd_str_entry(struct tcb *const tcp, const kernel_ulong_t arg,
if (print_quoted_string((char *) val.kb_string,
MIN(max_strlen,
- (unsigned int) ret ?: sizeof(val.kb_string)),
+ ret ? (unsigned int) ret : sizeof(val.kb_string)),
QUOTE_OMIT_TRAILING_0))
tprint_more_data_follows();
diff --git a/src/open.c b/src/open.c
index d7654d7e8..6c5c4a2a5 100644
--- a/src/open.c
+++ b/src/open.c
@@ -88,8 +88,9 @@ sprint_open_modes64(uint64_t flags)
}
*p = '\0';
- return sprintflags_ex(outstr, open_mode_flags, flags, sep,
- XLAT_STYLE_ABBREV) ?: outstr;
+ str = sprintflags_ex(outstr, open_mode_flags, flags, sep,
+ XLAT_STYLE_ABBREV);
+ return str ? str : outstr;
}
const char *
diff --git a/src/prctl.c b/src/prctl.c
index 97f42fe15..c0394782b 100644
--- a/src/prctl.c
+++ b/src/prctl.c
@@ -82,7 +82,6 @@ sprint_sve_val(kernel_ulong_t arg, bool aux)
kernel_ulong_t vl = arg & PR_SVE_VL_LEN_MASK;
kernel_ulong_t flags = arg & ~PR_SVE_VL_LEN_MASK;
- if (!flags && aux)
return NULL;
const char *flags_str = sprintflags_ex("", pr_sve_vl_flags, flags, '\0',
@@ -91,10 +90,10 @@ sprint_sve_val(kernel_ulong_t arg, bool aux)
if (!aux && flags && xlat_verbose(xlat_verbosity) == XLAT_STYLE_VERBOSE)
{
xsprintf(out, "%#" PRI_klx " /* %s%s%#" PRI_klx " */",
- arg, flags_str ?: "", flags_str ? "|" : "", vl);
+ arg, flags_str ? flags_str : "", flags_str ? "|" : "", vl);
} else {
xsprintf(out, "%s%s%#" PRI_klx,
- flags_str ?: "", flags_str ? "|" : "", vl);
+ flags_str ? flags_str : "", flags_str ? "|" : "", vl);
}
return out;
@@ -127,10 +126,10 @@ sprint_sme_val(kernel_ulong_t arg, bool aux)
if (!aux && flags && xlat_verbose(xlat_verbosity) == XLAT_STYLE_VERBOSE)
{
xsprintf(out, "%#" PRI_klx " /* %s%s%#" PRI_klx " */",
- arg, flags_str ?: "", flags_str ? "|" : "", vl);
+ arg, flags_str ? flags_str : "", flags_str ? "|" : "", vl);
} else {
xsprintf(out, "%s%s%#" PRI_klx,
- flags_str ?: "", flags_str ? "|" : "", vl);
+ flags_str ? flags_str : "", flags_str ? "|" : "", vl);
}
return out;
diff --git a/src/strace.c b/src/strace.c
index cea52bb22..154ee684f 100644
--- a/src/strace.c
+++ b/src/strace.c
@@ -2463,7 +2463,7 @@ init(int argc, char *argv[])
break;
case GETOPT_TS:
tflag_long_set = true;
- if (parse_ts_arg(optarg ?: tflag_str))
+ if (parse_ts_arg(optarg ? optarg : tflag_str))
error_opt_arg(c, lopt, optarg);
break;
case 'T':
@@ -2572,10 +2572,10 @@ init(int argc, char *argv[])
qualify_kvm(optarg);
break;
case GETOPT_QUAL_QUIET:
- qualify_quiet(optarg ?: qflag_qual);
+ qualify_quiet(optarg ? optarg : qflag_qual);
break;
case GETOPT_QUAL_DECODE_FD:
- qualify_decode_fd(optarg ?: yflag_qual);
+ qualify_decode_fd(optarg ? optarg : yflag_qual);
break;
case GETOPT_QUAL_DECODE_PID:
qualify_decode_pid(optarg);
--
2.37.3
|
