From 73f2bec5f804d772592b5a443dd3e72820389cfc Mon Sep 17 00:00:00 2001 From: Boris Egorov Date: Mon, 15 Sep 2014 23:33:17 +0700 Subject: 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 --- sys-utils/lscpu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sys-utils/lscpu.c') 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; -- cgit v1.2.3-55-g7522