diff options
| author | Sami Kerola | 2019-05-18 23:25:11 +0200 |
|---|---|---|
| committer | Sami Kerola | 2019-05-18 23:26:09 +0200 |
| commit | 6dd7b74b3ba1a9cea30f6406dce1f5108ec10f93 (patch) | |
| tree | b146b87b318f4b3bdb792ce4478ef46e07361b31 /sys-utils | |
| parent | libmount: avoid possible null pointer dereference [cppcheck] (diff) | |
| download | kernel-qcow2-util-linux-6dd7b74b3ba1a9cea30f6406dce1f5108ec10f93.tar.gz kernel-qcow2-util-linux-6dd7b74b3ba1a9cea30f6406dce1f5108ec10f93.tar.xz kernel-qcow2-util-linux-6dd7b74b3ba1a9cea30f6406dce1f5108ec10f93.zip | |
lscpu: remove redundant condition check [cppcheck]
[sys-utils/lscpu.c:1783] -> [sys-utils/lscpu.c:1785]: (warning) Either the
condition 'desc' is redundant or there is possible null pointer dereference: desc.
[sys-utils/lscpu.c:1840] -> [sys-utils/lscpu.c:1842]: (warning) Either the
condition 'desc' is redundant or there is possible null pointer dereference: desc.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'sys-utils')
| -rw-r--r-- | sys-utils/lscpu.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c index 9a5a1aa5b..dd5b86cb1 100644 --- a/sys-utils/lscpu.c +++ b/sys-utils/lscpu.c @@ -1778,10 +1778,12 @@ print_cpus_parsable(struct lscpu_desc *desc, int cols[], int ncols, int c; int cpu = real_cpu_num(desc, i); - if (!mod->offline && desc->online && !is_cpu_online(desc, cpu)) - continue; - if (!mod->online && desc->online && is_cpu_online(desc, cpu)) - continue; + if (desc->online) { + if (!mod->offline && !is_cpu_online(desc, cpu)) + continue; + if (!mod->online && is_cpu_online(desc, cpu)) + continue; + } if (desc->present && !is_cpu_present(desc, cpu)) continue; for (c = 0; c < ncols; c++) { @@ -1835,10 +1837,12 @@ print_cpus_readable(struct lscpu_desc *desc, int cols[], int ncols, struct libscols_line *line; int cpu = real_cpu_num(desc, i); - if (!mod->offline && desc->online && !is_cpu_online(desc, cpu)) - continue; - if (!mod->online && desc->online && is_cpu_online(desc, cpu)) - continue; + if (desc->online) { + if (!mod->offline && !is_cpu_online(desc, cpu)) + continue; + if (!mod->online && is_cpu_online(desc, cpu)) + continue; + } if (desc->present && !is_cpu_present(desc, cpu)) continue; |