lib/types: use unsigned int for interface, dns and prio counts

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/discover/device-handler.c b/discover/device-handler.c
index cfd0c7bf8b5effede8b706493301c44d7ffc5503..6fa14f9dd07ffb8c82d9df94c3344a12ca3d9ff5 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -368,7 +368,7 @@ static int default_option_priority(struct discover_boot_option *opt)
 {
        const struct config *config;
        struct boot_priority *prio;
-       int i;
+       unsigned int i;
 
        config = config_get();
 

diff --git a/discover/network.c b/discover/network.c
index 87075fcf91925666ed2b8c13757d13dff45b59fc..0490be9074486355ce436c173aeabb181affac64 100644 (file)
--- a/discover/network.c
+++ b/discover/network.c
@@ -69,7 +69,7 @@ static const struct interface_config *find_config_by_hwaddr(
                uint8_t *hwaddr)
 {
        const struct config *config;
-       int i;
+       unsigned int i;
 
        config = config_get();
        if (!config)
@@ -484,7 +484,8 @@ retry:
 static void network_init_dns(struct network *network)
 {
        const struct config *config;
-       int i, rc, len;
+       unsigned int i;
+       int rc, len;
        bool modified;
        char *buf;
 

diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c
index 1e53256e9c66bb60c44d104d227f510bd7e34bdf..40bc39fc516a36da4593899cbe762bd36d26162d 100644 (file)
--- a/lib/pb-config/pb-config.c
+++ b/lib/pb-config/pb-config.c
@@ -32,7 +32,7 @@ void config_set_defaults(struct config *config)
 void dump_config(struct config *config);
 void dump_config(struct config *config)
 {
-       int i;
+       unsigned int i;
 
        pb_log("configuration:\n");
 

diff --git a/lib/pb-config/storage-powerpc-nvram.c b/lib/pb-config/storage-powerpc-nvram.c
index 9dc565a099a154520edd453209620ca3cf666dd1..bd7526806aeb0c0d11cb2906fc28b78932648504 100644 (file)
--- a/lib/pb-config/storage-powerpc-nvram.c
+++ b/lib/pb-config/storage-powerpc-nvram.c
@@ -439,8 +439,8 @@ static char *dns_config_str(void *ctx, const char **dns_servers, int n)
 static void update_network_config(struct powerpc_nvram_storage *nv,
        struct config *config)
 {
+       unsigned int i;
        char *val;
-       int i;
 
        val = talloc_strdup(nv, "");
 

diff --git a/lib/types/types.h b/lib/types/types.h
index b71f0dd5903027685d53dade24a3a03b551fd65d..d73f1618e4631ff04738bfeef253d6a305e4c652 100644 (file)
--- a/lib/types/types.h
+++ b/lib/types/types.h
@@ -94,9 +94,9 @@ struct interface_config {
 
 struct network_config {
        struct interface_config **interfaces;
-       int                     n_interfaces;
+       unsigned int            n_interfaces;
        const char              **dns_servers;
-       int                     n_dns_servers;
+       unsigned int            n_dns_servers;
 };
 
 struct boot_priority {
@@ -105,10 +105,10 @@ struct boot_priority {
 
 struct config {
        bool                    autoboot_enabled;
-       int                     autoboot_timeout_sec;
+       unsigned int            autoboot_timeout_sec;
        struct network_config   network;
        struct boot_priority    *boot_priorities;
-       int                     n_boot_priorities;
+       unsigned int            n_boot_priorities;
 };
 
 #endif /* _TYPES_H */