diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-06-20 20:32:48 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-06-26 09:29:53 +0200 |
| commit | f7715c6680d3cae82812e26353208058f082c985 (patch) | |
| tree | e49ba8b35c54052ea2b1fe28ee0f58bcac462120 | |
| parent | 45b346554a65258f4a26ebf8f9b3200514265270 (diff) | |
| download | NetworkManager-f7715c6680d3cae82812e26353208058f082c985.tar.gz | |
libnm: use NMStrBuf in "nm-setting-bridge.c"
| -rw-r--r-- | libnm-core/nm-core-internal.h | 4 | ||||
| -rw-r--r-- | libnm-core/nm-setting-bridge.c | 35 |
2 files changed, 10 insertions, 29 deletions
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 1d67b09408..a5ccaeaa5c 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -894,10 +894,6 @@ gboolean nm_utils_base64secret_normalize (const char *base64_key, /*****************************************************************************/ -void _nm_bridge_vlan_str_append_rest (const NMBridgeVlan *vlan, - GString *string, - gboolean leading_space); - gboolean nm_utils_connection_is_adhoc_wpa (NMConnection *connection); const char *nm_utils_wifi_freq_to_band (guint32 freq); diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c index 2ead27393e..0595af8730 100644 --- a/libnm-core/nm-setting-bridge.c +++ b/libnm-core/nm-setting-bridge.c @@ -10,6 +10,7 @@ #include <ctype.h> #include <stdlib.h> +#include "nm-glib-aux/nm-str-buf.h" #include "nm-connection-private.h" #include "nm-utils.h" #include "nm-utils-private.h" @@ -407,25 +408,6 @@ nm_bridge_vlan_new_clone (const NMBridgeVlan *vlan) return copy; } -void -_nm_bridge_vlan_str_append_rest (const NMBridgeVlan *vlan, - GString *string, - gboolean leading_space) -{ - if (nm_bridge_vlan_is_pvid (vlan)) { - if (leading_space) - g_string_append_c (string, ' '); - g_string_append (string, "pvid"); - leading_space = TRUE; - } - if (nm_bridge_vlan_is_untagged (vlan)) { - if (leading_space) - g_string_append_c (string, ' '); - g_string_append (string, "untagged"); - leading_space = TRUE; - } -} - /** * nm_bridge_vlan_to_str: * @vlan: the %NMBridgeVlan @@ -440,7 +422,7 @@ _nm_bridge_vlan_str_append_rest (const NMBridgeVlan *vlan, char * nm_bridge_vlan_to_str (const NMBridgeVlan *vlan, GError **error) { - GString *string; + NMStrBuf string; g_return_val_if_fail (vlan, NULL); g_return_val_if_fail (!error || !*error, NULL); @@ -449,16 +431,19 @@ nm_bridge_vlan_to_str (const NMBridgeVlan *vlan, GError **error) * future if more parameters are added to the object that could * make it invalid. */ - string = g_string_sized_new (28); + nm_str_buf_init (&string, NM_UTILS_GET_NEXT_REALLOC_SIZE_32, FALSE); if (vlan->vid_start == vlan->vid_end) - g_string_append_printf (string, "%u", vlan->vid_start); + nm_str_buf_append_printf (&string, "%u", vlan->vid_start); else - g_string_append_printf (string, "%u-%u", vlan->vid_start, vlan->vid_end); + nm_str_buf_append_printf (&string, "%u-%u", vlan->vid_start, vlan->vid_end); - _nm_bridge_vlan_str_append_rest (vlan, string, TRUE); + if (nm_bridge_vlan_is_pvid (vlan)) + nm_str_buf_append (&string, " pvid"); + if (nm_bridge_vlan_is_untagged (vlan)) + nm_str_buf_append (&string, " untagged"); - return g_string_free (string, FALSE); + return nm_str_buf_finalize (&string, NULL); } /** |