ifcfg-rh/trivial: rename variable i in write_bridge_*setting() to indicate integer type

1 files changed, 35 insertions, 35 deletions

diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index d6fd82e6bc..b9f8161b9c 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -1420,7 +1420,7 @@ static gboolean
 write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wired, GError **error)
 {
 	NMSettingBridge *s_bridge;
-	guint32 i;
+	guint32 u32;
 	guint64 u64;
 	gboolean b;
 	const char *s;
@@ -1444,32 +1444,32 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 	if (nm_setting_bridge_get_stp (s_bridge)) {
 		svSetValueStr (ifcfg, "STP", "yes");
 
-		i = nm_setting_bridge_get_forward_delay (s_bridge);
-		if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_FORWARD_DELAY))
-			svSetValueInt64 (ifcfg, "DELAY", i);
+		u32 = nm_setting_bridge_get_forward_delay (s_bridge);
+		if (u32 != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_FORWARD_DELAY))
+			svSetValueInt64 (ifcfg, "DELAY", u32);
 
 		g_string_append_printf (opts, "priority=%u", nm_setting_bridge_get_priority (s_bridge));
 
-		i = nm_setting_bridge_get_hello_time (s_bridge);
-		if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_HELLO_TIME)) {
+		u32 = nm_setting_bridge_get_hello_time (s_bridge);
+		if (u32 != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_HELLO_TIME)) {
 			if (opts->len)
 				g_string_append_c (opts, ' ');
-			g_string_append_printf (opts, "hello_time=%u", i);
+			g_string_append_printf (opts, "hello_time=%u", u32);
 		}
 
-		i = nm_setting_bridge_get_max_age (s_bridge);
-		if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_MAX_AGE)) {
+		u32 = nm_setting_bridge_get_max_age (s_bridge);
+		if (u32 != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_MAX_AGE)) {
 			if (opts->len)
 				g_string_append_c (opts, ' ');
-			g_string_append_printf (opts, "max_age=%u", i);
+			g_string_append_printf (opts, "max_age=%u", u32);
 		}
 	}
 
-	i = nm_setting_bridge_get_ageing_time (s_bridge);
-	if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_AGEING_TIME)) {
+	u32 = nm_setting_bridge_get_ageing_time (s_bridge);
+	if (u32 != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_AGEING_TIME)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
-		g_string_append_printf (opts, "ageing_time=%u", i);
+		g_string_append_printf (opts, "ageing_time=%u", u32);
 	}
 
 	s = nm_setting_bridge_get_group_address (s_bridge);
@@ -1479,26 +1479,26 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 		g_string_append_printf (opts, "group_address=%s", s);
 	}
 
-	i = nm_setting_bridge_get_group_forward_mask (s_bridge);
-	if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_GROUP_FORWARD_MASK)) {
+	u32 = nm_setting_bridge_get_group_forward_mask (s_bridge);
+	if (u32 != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_GROUP_FORWARD_MASK)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
-		g_string_append_printf (opts, "group_fwd_mask=%u", i);
+		g_string_append_printf (opts, "group_fwd_mask=%u", u32);
 	}
 
 
-	i = nm_setting_bridge_get_multicast_hash_max (s_bridge);
-	if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_MULTICAST_HASH_MAX)) {
+	u32 = nm_setting_bridge_get_multicast_hash_max (s_bridge);
+	if (u32 != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_MULTICAST_HASH_MAX)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
-		g_string_append_printf (opts, "multicast_hash_max=%u", i);
+		g_string_append_printf (opts, "multicast_hash_max=%u", u32);
 	}
 
-	i = nm_setting_bridge_get_multicast_last_member_count (s_bridge);
-	if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT)) {
+	u32 = nm_setting_bridge_get_multicast_last_member_count (s_bridge);
+	if (u32 != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
-		g_string_append_printf (opts, "multicast_last_member_count=%u", i);
+		g_string_append_printf (opts, "multicast_last_member_count=%u", u32);
 	}
 
 	u64 = nm_setting_bridge_get_multicast_last_member_interval (s_bridge);
@@ -1557,11 +1557,11 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 		g_string_append_printf (opts, "multicast_snooping=%u", (guint32) b);
 	}
 
-	i = nm_setting_bridge_get_multicast_startup_query_count (s_bridge);
-	if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT)) {
+	u32 = nm_setting_bridge_get_multicast_startup_query_count (s_bridge);
+	if (u32 != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
-		g_string_append_printf (opts, "multicast_startup_query_count=%u", i);
+		g_string_append_printf (opts, "multicast_startup_query_count=%u", u32);
 	}
 
 	u64 = nm_setting_bridge_get_multicast_startup_query_interval (s_bridge);
@@ -1585,11 +1585,11 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 		g_string_append_printf (opts, "vlan_filtering=%u", (guint32) b);
 	}
 
-	i = nm_setting_bridge_get_vlan_default_pvid (s_bridge);
-	if (i != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID)) {
+	u32 = nm_setting_bridge_get_vlan_default_pvid (s_bridge);
+	if (u32 != get_setting_default_uint (s_bridge, NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID)) {
 		if (opts->len)
 			g_string_append_c (opts, ' ');
-		g_string_append_printf (opts, "default_pvid=%u", i);
+		g_string_append_printf (opts, "default_pvid=%u", u32);
 	}
 
 	s = nm_setting_bridge_get_vlan_protocol (s_bridge);
@@ -1628,7 +1628,7 @@ static gboolean
 write_bridge_port_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
 {
 	NMSettingBridgePort *s_port;
-	guint32 i;
+	guint32 u32;
 	GString *string;
 
 	s_port = nm_connection_get_setting_bridge_port (connection);
@@ -1638,15 +1638,15 @@ write_bridge_port_setting (NMConnection *connection, shvarFile *ifcfg, GError **
 	/* Bridge options */
 	string = g_string_sized_new (32);
 
-	i = nm_setting_bridge_port_get_priority (s_port);
-	if (i != get_setting_default_uint (NM_SETTING (s_port), NM_SETTING_BRIDGE_PORT_PRIORITY))
-		g_string_append_printf (string, "priority=%u", i);
+	u32 = nm_setting_bridge_port_get_priority (s_port);
+	if (u32 != get_setting_default_uint (NM_SETTING (s_port), NM_SETTING_BRIDGE_PORT_PRIORITY))
+		g_string_append_printf (string, "priority=%u", u32);
 
-	i = nm_setting_bridge_port_get_path_cost (s_port);
-	if (i != get_setting_default_uint (NM_SETTING (s_port), NM_SETTING_BRIDGE_PORT_PATH_COST)) {
+	u32 = nm_setting_bridge_port_get_path_cost (s_port);
+	if (u32 != get_setting_default_uint (NM_SETTING (s_port), NM_SETTING_BRIDGE_PORT_PATH_COST)) {
 		if (string->len)
 			g_string_append_c (string, ' ');
-		g_string_append_printf (string, "path_cost=%u", i);
+		g_string_append_printf (string, "path_cost=%u", u32);
 	}
 
 	if (nm_setting_bridge_port_get_hairpin_mode (s_port)) {