]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
machine: use size_t for array sizes (#10309)
authorLennart Poettering <lennart@poettering.net>
Tue, 9 Oct 2018 07:45:55 +0000 (09:45 +0200)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 9 Oct 2018 07:45:55 +0000 (16:45 +0900)
Some uses of n_netif already assumed it had time size_t. Others were a
bit sloppy. Let's clean this up.

src/machine/machine.c
src/machine/machine.h
src/machine/machinectl.c

index 6ab33d3bea9128a27f63b56713aed87cfca405ec..215ce12ae94a410a0c1a64fd5ec9a957b04ea5ef 100644 (file)
@@ -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);
 
index 946838f86f8ec33575316d9412f6236cab8e6715..967c11039b77be69ce324459d2982ecaa2a11fd2 100644 (file)
@@ -57,7 +57,7 @@ struct Machine {
         sd_bus_message *create_message;
 
         int *netif;
-        unsigned n_netif;
+        size_t n_netif;
 
         LIST_HEAD(Operation, operations);
 
index 47ccb352bf2549c6439e857c7bf24b797787aeb3..5a88d252e741b40021976b535a81226b9ef332a1 100644 (file)
@@ -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);