shared: move nm_utils_hwaddr_ntoa_buf() to shared/ as _nm_utils_hwaddr_ntoa()

The name is better as it mirrors nm_utils_hwaddr_aton(). Also, move
it to shared/ so it can be reused (and inlined).

5 files changed, 20 insertions, 22 deletions

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 2e9174ea3d..9cdafbf8b3 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -339,8 +339,6 @@ guint nm_setting_ethtool_init_features (NMSettingEthtool *setting,
 
 #define NM_UTILS_HWADDR_LEN_MAX_STR (NM_UTILS_HWADDR_LEN_MAX * 3)
 
-const char *nm_utils_hwaddr_ntoa_buf (gconstpointer addr, gsize addr_len, gboolean upper_case, char *buf, gsize buf_len);
-
 gboolean nm_utils_is_valid_iface_name_utf8safe (const char *utf8safe_name);
 
 GSList *    _nm_utils_hash_values_to_slist (GHashTable *hash);
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 14ce6a3a6d..534e7bac31 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -4154,18 +4154,6 @@ nm_utils_hwaddr_ntoa (gconstpointer addr, gsize length)
 	return nm_utils_bin2hexstr_full (addr, length, ':', TRUE, NULL);
 }
 
-const char *
-nm_utils_hwaddr_ntoa_buf (gconstpointer addr, gsize addr_len, gboolean upper_case, char *buf, gsize buf_len)
-{
-	g_return_val_if_fail (addr, NULL);
-	g_return_val_if_fail (addr_len > 0, NULL);
-	g_return_val_if_fail (buf, NULL);
-	if (buf_len < addr_len * 3)
-		g_return_val_if_reached (NULL);
-
-	return nm_utils_bin2hexstr_full (addr, addr_len, ':', upper_case, buf);
-}
-
 /**
  * nm_utils_hwaddr_valid:
  * @asc: the ASCII representation of a hardware address
diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h
index 49108a2fe5..28a519ae44 100644
--- a/shared/nm-glib-aux/nm-shared-utils.h
+++ b/shared/nm-glib-aux/nm-shared-utils.h
@@ -2067,6 +2067,18 @@ _nm_utils_hwaddr_aton (const char *asc, gpointer buffer, gsize buffer_length, gs
 	return nm_utils_hexstr2bin_full (asc, FALSE, TRUE, FALSE, ":-", 0, buffer, buffer_length, out_length);
 }
 
+static inline const char *
+_nm_utils_hwaddr_ntoa (gconstpointer addr, gsize addr_len, gboolean upper_case, char *buf, gsize buf_len)
+{
+	g_return_val_if_fail (addr, NULL);
+	g_return_val_if_fail (addr_len > 0, NULL);
+	g_return_val_if_fail (buf, NULL);
+	if (buf_len < addr_len * 3)
+		g_return_val_if_reached (NULL);
+
+	return nm_utils_bin2hexstr_full (addr, addr_len, ':', upper_case, buf);
+}
+
 /*****************************************************************************/
 
 #define _NM_UTILS_STRING_TABLE_LOOKUP_DEFINE(fcn_name, \
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index bd14099015..bb309e0372 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -16990,7 +16990,7 @@ nm_device_update_hw_address (NMDevice *self)
 		_LOGD (LOGD_PLATFORM | LOGD_DEVICE,
 		       "hw-addr: read a MAC address with differing length (%s vs. %s)",
 		       priv->hw_addr,
-		       nm_utils_hwaddr_ntoa_buf (hwaddr, hwaddrlen, TRUE, s_buf, sizeof (s_buf)));
+		       _nm_utils_hwaddr_ntoa (hwaddr, hwaddrlen, TRUE, s_buf, sizeof (s_buf)));
 		return FALSE;
 	}
 
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index 5a842d8778..d944a52d02 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -62,11 +62,11 @@ _nmp_link_address_to_string (const NMPLinkAddress *addr,
 	nm_assert (addr);
 
 	if (addr->len > 0) {
-		if (!nm_utils_hwaddr_ntoa_buf (addr->data,
-		                               addr->len,
-		                               TRUE,
-		                               buf,
-		                               NM_UTILS_HWADDR_LEN_MAX * 3)) {
+		if (!_nm_utils_hwaddr_ntoa (addr->data,
+		                            addr->len,
+		                            TRUE,
+		                            buf,
+		                            NM_UTILS_HWADDR_LEN_MAX * 3)) {
 			buf[0] = '\0';
 			g_return_val_if_reached (buf);
 		}
@@ -1221,7 +1221,7 @@ nm_platform_link_add (NMPlatform *self,
 	        parent > 0 ? ", parent " : "",
 	        parent > 0 ? nm_sprintf_buf (parent_buf, "%d", parent) : "",
 	        address ? ", address: " : "",
-	        address ? nm_utils_hwaddr_ntoa_buf (address, address_len, FALSE, addr_buf, sizeof (addr_buf)) : "",
+	        address ? _nm_utils_hwaddr_ntoa (address, address_len, FALSE, addr_buf, sizeof (addr_buf)) : "",
 	        ({
 	            char *buf_p = buf;
 	            gsize buf_len = sizeof (buf);
@@ -6875,7 +6875,7 @@ nm_platform_vf_to_string (const NMPlatformVF *vf, char *buf, gsize len)
 		return buf;
 
 	if (vf->mac.len) {
-		nm_utils_hwaddr_ntoa_buf (vf->mac.data, vf->mac.len, TRUE, mac, sizeof (mac));
+		_nm_utils_hwaddr_ntoa (vf->mac.data, vf->mac.len, TRUE, mac, sizeof (mac));
 		nm_sprintf_buf (str_mac, " mac %s", mac);
 	} else
 		str_mac[0] = '\0';