ifcfg-rh: use nm_gstring_add_space_delimiter() in write_bridge_setting()

1 files changed, 22 insertions, 44 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 2eb3cf0ce2..1626a913e6 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -1511,157 +1511,135 @@ write_bridge_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wire
 
 		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, ' ');
+			nm_gstring_add_space_delimiter (opts);
 			g_string_append_printf (opts, "hello_time=%u", u32);
 		}
 
 		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, ' ');
+			nm_gstring_add_space_delimiter (opts);
 			g_string_append_printf (opts, "max_age=%u", u32);
 		}
 	}
 
 	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, ' ');
+		nm_gstring_add_space_delimiter (opts);
 		g_string_append_printf (opts, "ageing_time=%u", u32);
 	}
 
 	s = nm_setting_bridge_get_group_address (s_bridge);
 	if (s) {
-		if (opts->len)
-			g_string_append_c (opts, ' ');
+		nm_gstring_add_space_delimiter (opts);
 		g_string_append_printf (opts, "group_address=%s", s);
 	}
 
 	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, ' ');
+		nm_gstring_add_space_delimiter (opts);
 		g_string_append_printf (opts, "group_fwd_mask=%u", u32);
 	}
 
 
 	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, ' ');
+		nm_gstring_add_space_delimiter (opts);
 		g_string_append_printf (opts, "multicast_hash_max=%u", u32);
 	}
 
 	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, ' ');
+		nm_gstring_add_space_delimiter (opts);
 		g_string_append_printf (opts, "multicast_last_member_count=%u", u32);
 	}
 
 	u64 = nm_setting_bridge_get_multicast_last_member_interval (s_bridge);
 	if (u64 != get_setting_default_uint64 (s_bridge, NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL)) {
-		if (opts->len)
-			g_string_append_c (opts, ' ');
+		nm_gstring_add_space_delimiter (opts);
 		g_string_append_printf (opts, "multicast_last_member_interval=%"G_GUINT64_FORMAT, u64);
 	}
 
 	u64 = nm_setting_bridge_get_multicast_membership_interval (s_bridge);
 	if (u64 != get_setting_default_uint64 (s_bridge, NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL)) {
-		if (opts->len)
-			g_string_append_c (opts, ' ');
+		nm_gstring_add_space_delimiter (opts);
 		g_string_append_printf (opts, "multicast_membership_interval=%"G_GUINT64_FORMAT, u64);
 	}
 
 	b = nm_setting_bridge_get_multicast_querier (s_bridge);
 	if (b != get_setting_default_boolean (s_bridge, NM_SETTING_BRIDGE_MULTICAST_QUERIER)) {
-		if (opts->len)
-			g_string_append_c (opts, ' ');
+		nm_gstring_add_space_delimiter (opts);
 		g_string_append_printf (opts, "multicast_querier=%u", (guint) b);
 	}
 
 	u64 = nm_setting_bridge_get_multicast_querier_interval (s_bridge);
 	if (u64 != get_setting_default_uint64 (s_bridge, NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL)) {
-		if (opts->len)
-			g_string_append_c (opts, ' ');
+		nm_gstring_add_space_delimiter (opts);
 		g_string_append_printf (opts, "multicast_querier_interval=%"G_GUINT64_FORMAT, u64);
 	}
 
 	u64 = nm_setting_bridge_get_multicast_query_interval (s_bridge);
 	if (u64 != get_setting_default_uint64 (s_bridge, NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL)) {
-		if (opts->len)
-			g_string_append_c (opts, ' ');
+		nm_gstring_add_space_delimiter (opts);
 		g_string_append_printf (opts, "multicast_query_interval=%"G_GUINT64_FORMAT, u64);
 	}
 
 	u64 = nm_setting_bridge_get_multicast_query_response_interval (s_bridge);
 	if (u64 != get_setting_default_uint64 (s_bridge, NM_SETTING_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL)) {
-		if (opts->len)
-			g_string_append_c (opts, ' ');
+		nm_gstring_add_space_delimiter (opts);
 		g_string_append_printf (opts, "multicast_query_response_interval=%"G_GUINT64_FORMAT, u64);
 	}
 
 	b = nm_setting_bridge_get_multicast_query_use_ifaddr (s_bridge);
 	if (b != get_setting_default_boolean (s_bridge, NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR)) {
-		if (opts->len)
-			g_string_append_c (opts, ' ');
+		nm_gstring_add_space_delimiter (opts);
 		g_string_append_printf (opts, "multicast_query_use_ifaddr=%u", (guint) b);
 	}
 
 	b = nm_setting_bridge_get_multicast_snooping (s_bridge);
 	if (b != get_setting_default_boolean (s_bridge, NM_SETTING_BRIDGE_MULTICAST_SNOOPING)) {
-		if (opts->len)
-			g_string_append_c (opts, ' ');
+		nm_gstring_add_space_delimiter (opts);
 		g_string_append_printf (opts, "multicast_snooping=%u", (guint32) b);
 	}
 
 	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, ' ');
+		nm_gstring_add_space_delimiter (opts);
 		g_string_append_printf (opts, "multicast_startup_query_count=%u", u32);
 	}
 
 	u64 = nm_setting_bridge_get_multicast_startup_query_interval (s_bridge);
 	if (u64 != get_setting_default_uint64 (s_bridge, NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL)) {
-		if (opts->len)
-			g_string_append_c (opts, ' ');
+		nm_gstring_add_space_delimiter (opts);
 		g_string_append_printf (opts, "multicast_startup_query_interval=%"G_GUINT64_FORMAT, u64);
 	}
 
 	s = nm_setting_bridge_get_multicast_router (s_bridge);
 	if (s) {
-		if (opts->len)
-			g_string_append_c (opts, ' ');
+		nm_gstring_add_space_delimiter (opts);
 		g_string_append_printf (opts, "multicast_router=%s", s);
 	}
 
 	b = nm_setting_bridge_get_vlan_filtering (s_bridge);
 	if (b != get_setting_default_boolean (s_bridge, NM_SETTING_BRIDGE_VLAN_FILTERING)) {
-		if (opts->len)
-			g_string_append_c (opts, ' ');
+		nm_gstring_add_space_delimiter (opts);
 		g_string_append_printf (opts, "vlan_filtering=%u", (guint32) b);
 	}
 
 	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, ' ');
+		nm_gstring_add_space_delimiter (opts);
 		g_string_append_printf (opts, "default_pvid=%u", u32);
 	}
 
 	s = nm_setting_bridge_get_vlan_protocol (s_bridge);
 	if (s) {
-		if (opts->len)
-			g_string_append_c (opts, ' ');
+		nm_gstring_add_space_delimiter (opts);
 		g_string_append_printf (opts, "vlan_protocol=%s", s);
 	}
 
 	b = nm_setting_bridge_get_vlan_stats_enabled (s_bridge);
 	if (b != get_setting_default_boolean (s_bridge, NM_SETTING_BRIDGE_VLAN_STATS_ENABLED)) {
-		if (opts->len)
-			g_string_append_c (opts, ' ');
+		nm_gstring_add_space_delimiter (opts);
 		g_string_append_printf (opts, "vlan_stats_enabled=%u", (guint) b);
 	}