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>

diff --git a/sys-utils/lscpu-dmi.c b/sys-utils/lscpu-dmi.c
index 6c870a11348858dbf283615784dcc592f2be8d9a..0e497d10c1bb35944f37ae8f84018ef1f9464c3b 100644 (file)
--- 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 9965eeb65ca327e6376fad36f12a569018b6d6d2..8827424435aa66e0bcfaff0e2ce4ac4e5e26e48b 100644 (file)
--- 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;