From: Lennart Poettering Date: Tue, 9 Oct 2018 07:45:55 +0000 (+0200) Subject: machine: use size_t for array sizes (#10309) X-Git-Tag: v240~608 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68e16e9c7224883e224fc21b32bd66ce1ef706b3;p=thirdparty%2Fsystemd.git machine: use size_t for array sizes (#10309) Some uses of n_netif already assumed it had time size_t. Others were a bit sloppy. Let's clean this up. --- diff --git a/src/machine/machine.c b/src/machine/machine.c index 6ab33d3bea9..215ce12ae94 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -183,7 +183,7 @@ int machine_save(Machine *m) { m->timestamp.monotonic); if (m->n_netif > 0) { - unsigned i; + size_t i; fputs("NETIF=", f); diff --git a/src/machine/machine.h b/src/machine/machine.h index 946838f86f8..967c11039b7 100644 --- a/src/machine/machine.h +++ b/src/machine/machine.h @@ -57,7 +57,7 @@ struct Machine { sd_bus_message *create_message; int *netif; - unsigned n_netif; + size_t n_netif; LIST_HEAD(Operation, operations); diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index 47ccb352bf2..5a88d252e74 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -540,7 +540,7 @@ typedef struct MachineStatusInfo { pid_t leader; struct dual_timestamp timestamp; int *netif; - unsigned n_netif; + size_t n_netif; } MachineStatusInfo; static void machine_status_info_clear(MachineStatusInfo *info) { @@ -600,7 +600,7 @@ static void print_machine_status_info(sd_bus *bus, MachineStatusInfo *i) { printf("\t Root: %s\n", i->root_directory); if (i->n_netif > 0) { - unsigned c; + size_t c; fputs("\t Iface:", stdout);