summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-11-27 13:57:13 +0100
committerThomas Haller <thaller@redhat.com>2016-11-27 13:57:13 +0100
commit4cc2f8906cf9fd1cb763b5b809478874d3d896e4 (patch)
tree42a5ef80cd541dcd2199a33d01c60ceb249ee299
parent542d1c257d4bbdf534a2d90aefa895c8de036163 (diff)
downloadNetworkManager-4cc2f8906cf9fd1cb763b5b809478874d3d896e4.tar.gz
libnm: drop _bin2str() util
It was only used by two places, inline it.
-rw-r--r--libnm-core/nm-utils.c25
1 files changed, 10 insertions, 15 deletions
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index bfbb93d636..e766516b3a 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -3272,19 +3272,6 @@ nm_utils_bin2hexstr (gconstpointer src, gsize len, int final_len)
return result;
}
-static char *
-_bin2str (gconstpointer addr, gsize length, gboolean upper_case)
-{
- char *result;
-
- nm_assert (addr);
- nm_assert (length > 0);
-
- result = g_malloc (length * 3);
- _bin2str_buf (addr, length, ':', upper_case, result);
- return result;
-}
-
/**
* nm_utils_hwaddr_ntoa:
* @addr: (type guint8) (array length=length): a binary hardware address
@@ -3297,10 +3284,14 @@ _bin2str (gconstpointer addr, gsize length, gboolean upper_case)
char *
nm_utils_hwaddr_ntoa (gconstpointer addr, gsize length)
{
+ char *result;
+
g_return_val_if_fail (addr, g_strdup (""));
g_return_val_if_fail (length > 0, g_strdup (""));
- return _bin2str (addr, length, TRUE);
+ result = g_malloc (length * 3);
+ _bin2str_buf (addr, length, ':', TRUE, result);
+ return result;
}
const char *
@@ -3329,10 +3320,14 @@ nm_utils_hwaddr_ntoa_buf (gconstpointer addr, gsize addr_len, gboolean upper_cas
char *
_nm_utils_bin2str (gconstpointer addr, gsize length, gboolean upper_case)
{
+ char *result;
+
g_return_val_if_fail (addr, g_strdup (""));
g_return_val_if_fail (length > 0, g_strdup (""));
- return _bin2str (addr, length, upper_case);
+ result = g_malloc (length * 3);
+ _bin2str_buf (addr, length, ':', upper_case, result);
+ return result;
}
/**