diff options
| author | Boris Egorov <egorov@linux.com> | 2014-09-15 23:33:17 +0700 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2014-10-24 10:07:28 +0200 |
| commit | 868c07ea59ad0ea483e269bed4a1422daa3f343f (patch) | |
| tree | 53ec6fb4c0c0b7f3f81738fd7d8948b134f24111 | |
| parent | 2e94fb841f5e3beaf47da1b8a9b0bd7d8bcd3a0e (diff) | |
| download | util-linux-868c07ea59ad0ea483e269bed4a1422daa3f343f.tar.gz | |
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>
| -rw-r--r-- | sys-utils/lscpu-dmi.c | 2 | ||||
| -rw-r--r-- | sys-utils/lscpu.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys-utils/lscpu-dmi.c b/sys-utils/lscpu-dmi.c index 6c870a113..0e497d10c 100644 --- a/sys-utils/lscpu-dmi.c +++ b/sys-utils/lscpu-dmi.c @@ -161,7 +161,7 @@ static int hypervisor_from_dmi_table(uint32_t base, uint16_t len, else if (manufacturer && strstr(manufacturer, "HITACHI") && product && strstr(product, "LPAR")) rc = HYPER_HITACHI; - else if (!vendor && strcmp(vendor, "Parallels")) + else if (vendor && !strcmp(vendor, "Parallels")) rc = HYPER_PARALLELS; done: free(buf); 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; |