core: cleanup type of route metric to ensure guint32

Kernel, netlink an NMPlatformRoute treat route metrics as
uint32. Fix several places to use the exact type.

Signed-off-by: Thomas Haller <thaller@redhat.com>

4 files changed, 13 insertions, 13 deletions

diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c
index 085f7f3655..b6b571eb5f 100644
--- a/src/dhcp-manager/nm-dhcp-client.c
+++ b/src/dhcp-manager/nm-dhcp-client.c
@@ -42,7 +42,7 @@ typedef struct {
 	GByteArray * hwaddr;
 	gboolean     ipv6;
 	char *       uuid;
-	guint        priority;
+	guint32      priority;
 	guint32      timeout;
 	GByteArray * duid;
 
@@ -885,7 +885,7 @@ nm_dhcp_client_class_init (NMDhcpClientClass *client_class)
 	g_object_class_install_property
 		(object_class, PROP_PRIORITY,
 		 g_param_spec_uint (NM_DHCP_CLIENT_PRIORITY, "", "",
-		                    0, G_MAXUINT, 0,
+		                    0, G_MAXUINT32, 0,
 		                    G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
 		                    G_PARAM_STATIC_STRINGS));
 
diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c
index 2df3cb108c..5c139b8ca2 100644
--- a/src/dhcp-manager/nm-dhcp-manager.c
+++ b/src/dhcp-manager/nm-dhcp-manager.c
@@ -359,7 +359,7 @@ client_start (NMDhcpManager *self,
               int ifindex,
               const GByteArray *hwaddr,
               const char *uuid,
-              guint priority,
+              guint32 priority,
               gboolean ipv6,
               const char *dhcp_client_id,
               guint32 timeout,
@@ -433,7 +433,7 @@ nm_dhcp_manager_start_ip4 (NMDhcpManager *self,
                            int ifindex,
                            const GByteArray *hwaddr,
                            const char *uuid,
-                           guint priority,
+                           guint32 priority,
                            gboolean send_hostname,
                            const char *dhcp_hostname,
                            const char *dhcp_client_id,
@@ -458,7 +458,7 @@ nm_dhcp_manager_start_ip6 (NMDhcpManager *self,
                            int ifindex,
                            const GByteArray *hwaddr,
                            const char *uuid,
-                           guint priority,
+                           guint32 priority,
                            gboolean send_hostname,
                            const char *dhcp_hostname,
                            guint32 timeout,
diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp-manager/nm-dhcp-manager.h
index 0228130e0f..0c3c3f2506 100644
--- a/src/dhcp-manager/nm-dhcp-manager.h
+++ b/src/dhcp-manager/nm-dhcp-manager.h
@@ -56,7 +56,7 @@ NMDhcpClient * nm_dhcp_manager_start_ip4     (NMDhcpManager *manager,
                                               int ifindex,
                                               const GByteArray *hwaddr,
                                               const char *uuid,
-                                              guint priority,
+                                              guint32 priority,
                                               gboolean send_hostname,
                                               const char *dhcp_hostname,
                                               const char *dhcp_client_id,
@@ -68,7 +68,7 @@ NMDhcpClient * nm_dhcp_manager_start_ip6     (NMDhcpManager *manager,
                                               int ifindex,
                                               const GByteArray *hwaddr,
                                               const char *uuid,
-                                              guint priority,
+                                              guint32 priority,
                                               gboolean send_hostname,
                                               const char *dhcp_hostname,
                                               guint32 timeout,
diff --git a/src/dhcp-manager/nm-dhcp-utils.c b/src/dhcp-manager/nm-dhcp-utils.c
index 424d93db11..d9eb85df86 100644
--- a/src/dhcp-manager/nm-dhcp-utils.c
+++ b/src/dhcp-manager/nm-dhcp-utils.c
@@ -34,7 +34,7 @@
 
 static gboolean
 ip4_process_dhcpcd_rfc3442_routes (const char *str,
-                                   guint priority,
+                                   guint32 priority,
                                    NMIP4Config *ip4_config,
                                    guint32 *gwaddr)
 {
@@ -161,7 +161,7 @@ error:
 
 static gboolean
 ip4_process_dhclient_rfc3442_routes (const char *str,
-                                     guint priority,
+                                     guint32 priority,
                                      NMIP4Config *ip4_config,
                                      guint32 *gwaddr)
 {
@@ -209,7 +209,7 @@ out:
 
 static gboolean
 ip4_process_classless_routes (GHashTable *options,
-                              guint priority,
+                              guint32 priority,
                               NMIP4Config *ip4_config,
                               guint32 *gwaddr)
 {
@@ -272,7 +272,7 @@ ip4_process_classless_routes (GHashTable *options,
 }
 
 static void
-process_classful_routes (GHashTable *options, guint priority, NMIP4Config *ip4_config)
+process_classful_routes (GHashTable *options, guint32 priority, NMIP4Config *ip4_config)
 {
 	const char *str;
 	char **searches, **s;
@@ -374,7 +374,7 @@ ip4_add_domain_search (gpointer data, gpointer user_data)
 NMIP4Config *
 nm_dhcp_utils_ip4_config_from_options (const char *iface,
                                        GHashTable *options,
-                                       guint priority)
+                                       guint32 priority)
 {
 	NMIP4Config *ip4_config = NULL;
 	guint32 tmp_addr;
@@ -591,7 +591,7 @@ ip6_add_domain_search (gpointer data, gpointer user_data)
 NMIP6Config *
 nm_dhcp_utils_ip6_config_from_options (const char *iface,
                                        GHashTable *options,
-                                       guint priority,
+                                       guint32 priority,
                                        gboolean info_only)
 {
 	NMIP6Config *ip6_config = NULL;