summaryrefslogtreecommitdiffstats
path: root/sys-utils/lscpu.c
diff options
context:
space:
mode:
authorBoris Egorov2014-09-15 18:33:17 +0200
committerKarel Zak2014-09-16 11:16:09 +0200
commit73f2bec5f804d772592b5a443dd3e72820389cfc (patch)
tree071c3b19f881f9081c5e4f4d4fe20bb35777b53d /sys-utils/lscpu.c
parentfdformat: fixing copy'n'paste issue in the manual (diff)
downloadkernel-qcow2-util-linux-73f2bec5f804d772592b5a443dd3e72820389cfc.tar.gz
kernel-qcow2-util-linux-73f2bec5f804d772592b5a443dd3e72820389cfc.tar.xz
kernel-qcow2-util-linux-73f2bec5f804d772592b5a443dd3e72820389cfc.zip
lscpu: fix cppcheck warnings
CppCheck founds a few wrong arguments in format strings and a NULL pointer dereference. Amended version with fixed strcmp() usage. Signed-off-by: Boris Egorov <egorov@linux.com>
Diffstat (limited to 'sys-utils/lscpu.c')
-rw-r--r--sys-utils/lscpu.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 9965eeb65..882742443 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -1182,12 +1182,12 @@ get_cell_data(struct lscpu_desc *desc, int idx, int col,
case COL_CORE:
if (cpuset_ary_isset(cpu, desc->coremaps,
desc->ncores, setsize, &i) == 0)
- snprintf(buf, bufsz, "%zd", i);
+ snprintf(buf, bufsz, "%zu", i);
break;
case COL_SOCKET:
if (cpuset_ary_isset(cpu, desc->socketmaps,
desc->nsockets, setsize, &i) == 0)
- snprintf(buf, bufsz, "%zd", i);
+ snprintf(buf, bufsz, "%zu", i);
break;
case COL_NODE:
if (cpuset_ary_isset(cpu, desc->nodemaps,
@@ -1197,7 +1197,7 @@ get_cell_data(struct lscpu_desc *desc, int idx, int col,
case COL_BOOK:
if (cpuset_ary_isset(cpu, desc->bookmaps,
desc->nbooks, setsize, &i) == 0)
- snprintf(buf, bufsz, "%zd", i);
+ snprintf(buf, bufsz, "%zu", i);
break;
case COL_CACHE:
{
@@ -1210,7 +1210,7 @@ get_cell_data(struct lscpu_desc *desc, int idx, int col,
if (cpuset_ary_isset(cpu, ca->sharedmaps,
ca->nsharedmaps, setsize, &i) == 0) {
- int x = snprintf(p, sz, "%zd", i);
+ int x = snprintf(p, sz, "%zu", i);
if (x <= 0 || (size_t) x + 2 >= sz)
return NULL;
p += x;