lscpu: use size_t for counters

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/sys-utils/lscpu-topology.c b/sys-utils/lscpu-topology.c
index 05d1ae1640abeeabfb10850e4a1d5c52d6f66759..d6cef7d20fc924c0ad01498087aceccfe943d9c3 100644 (file)
--- a/sys-utils/lscpu-topology.c
+++ b/sys-utils/lscpu-topology.c
@@ -10,9 +10,9 @@
 #include "lscpu.h"
 
 /* add @set to the @ary, unnecessary set is deallocated. */
-static int add_cpuset_to_array(cpu_set_t **ary, int *items, cpu_set_t *set, size_t setsize)
+static int add_cpuset_to_array(cpu_set_t **ary, size_t *items, cpu_set_t *set, size_t setsize)
 {
-       int i;
+       size_t i;
 
        if (!ary)
                return -EINVAL;
@@ -178,7 +178,7 @@ static int cputype_read_topology(struct lscpu_cxt *cxt, struct lscpu_cputype *ct
                DBG(TYPE, ul_debugobj(ct, " reading sysinfo"));
 
                while (fgets(buf, sizeof(buf), fd) != NULL) {
-                       if (sscanf(buf, "CPU Topology SW: %d %d %d %d %d %d",
+                       if (sscanf(buf, "CPU Topology SW: %d %d %zu %zu %zu %zu",
                                        &t0, &t1,
                                        &ct->ndrawers_per_system,
                                        &ct->nbooks_per_drawer,
@@ -211,11 +211,11 @@ static int cputype_read_topology(struct lscpu_cxt *cxt, struct lscpu_cputype *ct
                        ct->ndrawers_per_system = ct->ndrawers;
        }
 
-       DBG(TYPE, ul_debugobj(ct, " nthreads: %d (per core)", ct->nthreads_per_core));
-       DBG(TYPE, ul_debugobj(ct, "   ncores: %d (%d per socket)", ct->ncores, ct->ncores_per_socket));
-       DBG(TYPE, ul_debugobj(ct, " nsockets: %d (%d per books)", ct->nsockets, ct->nsockets_per_book));
-       DBG(TYPE, ul_debugobj(ct, "   nbooks: %d (%d per drawer)", ct->nbooks, ct->nbooks_per_drawer));
-       DBG(TYPE, ul_debugobj(ct, " ndrawers: %d (%d per system)", ct->ndrawers, ct->ndrawers_per_system));
+       DBG(TYPE, ul_debugobj(ct, " nthreads: %zu (per core)", ct->nthreads_per_core));
+       DBG(TYPE, ul_debugobj(ct, "   ncores: %zu (%zu per socket)", ct->ncores, ct->ncores_per_socket));
+       DBG(TYPE, ul_debugobj(ct, " nsockets: %zu (%zu per books)", ct->nsockets, ct->nsockets_per_book));
+       DBG(TYPE, ul_debugobj(ct, "   nbooks: %zu (%zu per drawer)", ct->nbooks, ct->nbooks_per_drawer));
+       DBG(TYPE, ul_debugobj(ct, " ndrawers: %zu (%zu per system)", ct->ndrawers, ct->ndrawers_per_system));
 
        return 0;
 }

diff --git a/sys-utils/lscpu.h b/sys-utils/lscpu.h
index 868b0e20c1bafd5507beeafd6fe874b84f9fe880..2ea5cfc5513747897a1ed3ea5d4da89384016199 100644 (file)
--- a/sys-utils/lscpu.h
+++ b/sys-utils/lscpu.h
@@ -50,7 +50,7 @@ struct lscpu_cache {
        unsigned int    number_of_sets;
        unsigned int    coherency_line_size;
 
-       int             nsharedmaps;
+       size_t          nsharedmaps;
        cpu_set_t       **sharedmaps;
 };
 
@@ -71,24 +71,24 @@ struct lscpu_cputype {
        int     dispatching;    /* -1 if not evailable, DIST_* */
        int     freqboost;      /* -1 if not evailable */
 
-       int     physsockets;    /* Physical sockets (modules) */
-       int     physchips;      /* Physical chips */
-       int     physcoresperchip;       /* Physical cores per chip */
+       size_t  physsockets;    /* Physical sockets (modules) */
+       size_t  physchips;      /* Physical chips */
+       size_t  physcoresperchip;       /* Physical cores per chip */
 
-       int     nthreads_per_core;
-       int     ncores_per_socket;
-       int     nsockets_per_book;
-       int     nbooks_per_drawer;
-       int     ndrawers_per_system;
+       size_t  nthreads_per_core;
+       size_t  ncores_per_socket;
+       size_t  nsockets_per_book;
+       size_t  nbooks_per_drawer;
+       size_t  ndrawers_per_system;
 
        /* siblings maps */
-       int             ncores;
+       size_t          ncores;
        cpu_set_t       **coremaps;
-       int             nsockets;
+       size_t          nsockets;
        cpu_set_t       **socketmaps;
-       int             nbooks;
+       size_t          nbooks;
        cpu_set_t       **bookmaps;
-       int             ndrawers;
+       size_t          ndrawers;
        cpu_set_t       **drawermaps;
 };