From d060958a6dc98e3afe224b297ffaaf7d82d41daf Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 10 Jul 2016 13:51:57 +0200 Subject: [PATCH] libnm: minor cleanup of _bin2str() --- libnm-core/nm-utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index fffde23091..a31a91906f 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -3068,10 +3068,11 @@ nm_utils_hwaddr_aton (const char *asc, gpointer buffer, gsize length) } static char * -_bin2str (gconstpointer addr, gsize length, const char *LOOKUP) +_bin2str (gconstpointer addr, gsize length, gboolean upper_case) { const guint8 *in = addr; char *out, *result; + const char *LOOKUP = upper_case ? "0123456789ABCDEF" : "0123456789abcdef"; g_return_val_if_fail (addr != NULL, g_strdup ("")); g_return_val_if_fail (length > 0, g_strdup ("")); @@ -3102,7 +3103,7 @@ _bin2str (gconstpointer addr, gsize length, const char *LOOKUP) char * nm_utils_hwaddr_ntoa (gconstpointer addr, gsize length) { - return _bin2str (addr, length, "0123456789ABCDEF"); + return _bin2str (addr, length, TRUE); } /** @@ -3118,8 +3119,7 @@ nm_utils_hwaddr_ntoa (gconstpointer addr, gsize length) char * _nm_utils_bin2str (gconstpointer addr, gsize length, gboolean upper_case) { - return _bin2str (addr, length, - upper_case ? "0123456789ABCDEF" : "0123456789abcdef"); + return _bin2str (addr, length, upper_case); } static int