core: use MAC_ARG/MAC_FMT where appropriatedanw/hwaddr

4 files changed, 13 insertions, 22 deletions

diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h
index bb5043fa65..d04d4f3bb4 100644
--- a/src/NetworkManagerUtils.h
+++ b/src/NetworkManagerUtils.h
@@ -28,6 +28,9 @@
 #include "nm-connection.h"
 #include "nm-platform.h"
 
+#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
+#define MAC_ARG(x) ((guint8*)(x))[0],((guint8*)(x))[1],((guint8*)(x))[2],((guint8*)(x))[3],((guint8*)(x))[4],((guint8*)(x))[5]
+
 gboolean nm_ethernet_address_is_valid (const guint8 *test_addr);
 
 in_addr_t nm_utils_ip4_address_clear_host_address (in_addr_t addr, guint8 plen);
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index 314813f49a..b4d87b600f 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -382,10 +382,7 @@ find_active_ap (NMDeviceWifi *self,
 	guint32 devfreq;
 
 	nm_platform_wifi_get_bssid (ifindex, bssid);
-	nm_log_dbg (LOGD_WIFI, "(%s): active BSSID: %02x:%02x:%02x:%02x:%02x:%02x",
-	            iface,
-	            bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5]);
-
+	nm_log_dbg (LOGD_WIFI, "(%s): active BSSID: " MAC_FMT, iface, MAC_ARG (bssid));
 	if (!nm_ethernet_address_is_valid (bssid))
 		return NULL;
 
@@ -414,12 +411,11 @@ find_active_ap (NMDeviceWifi *self,
 			NM80211Mode apmode;
 			guint32 apfreq;
 
-			nm_log_dbg (LOGD_WIFI, "    AP: %s%s%s  %02x:%02x:%02x:%02x:%02x:%02x",
+			nm_log_dbg (LOGD_WIFI, "    AP: %s%s%s  " MAC_FMT,
 			            ap_ssid ? "'" : "",
 			            ap_ssid ? nm_utils_escape_ssid (ap_ssid->data, ap_ssid->len) : "(none)",
 			            ap_ssid ? "'" : "",
-			            ap_bssid[0], ap_bssid[1], ap_bssid[2],
-			            ap_bssid[3], ap_bssid[4], ap_bssid[5]);
+			            MAC_ARG (ap_bssid));
 
 			if (ap == ignore_ap) {
 				nm_log_dbg (LOGD_WIFI, "      ignored");
@@ -481,11 +477,11 @@ find_active_ap (NMDeviceWifi *self,
 		const guint8 *ap_bssid = nm_ap_get_address (match_nofreq);
 		const GByteArray *ap_ssid = nm_ap_get_ssid (match_nofreq);
 
-		nm_log_dbg (LOGD_WIFI, "    matched %s%s%s  %02x:%02x:%02x:%02x:%02x:%02x",
+		nm_log_dbg (LOGD_WIFI, "    matched %s%s%s  " MAC_FMT,
 		            ap_ssid ? "'" : "",
 		            ap_ssid ? nm_utils_escape_ssid (ap_ssid->data, ap_ssid->len) : "(none)",
 		            ap_ssid ? "'" : "",
-		            ap_bssid[0], ap_bssid[1], ap_bssid[2], ap_bssid[3], ap_bssid[4], ap_bssid[5]);
+		            MAC_ARG (ap_bssid));
 
 		active_ap = match_nofreq;
 		goto done;
@@ -1690,9 +1686,6 @@ try_fill_ssid_for_hidden_ap (NMAccessPoint *ap)
 	}
 }
 
-#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
-#define MAC_ARG(x) ((guint8*)(x))[0],((guint8*)(x))[1],((guint8*)(x))[2],((guint8*)(x))[3],((guint8*)(x))[4],((guint8*)(x))[5]
-
 /*
  * merge_scanned_ap
  *
@@ -1841,8 +1834,8 @@ cull_scan_list (NMDeviceWifi *self)
 		bssid = nm_ap_get_address (outdated_ap);
 		ssid = nm_ap_get_ssid (outdated_ap);
 		nm_log_dbg (LOGD_WIFI_SCAN,
-		            "   removing %02x:%02x:%02x:%02x:%02x:%02x (%s%s%s)",
-		            bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5],
+		            "   removing " MAC_FMT " (%s%s%s)",
+		            MAC_ARG (bssid),
 		            ssid ? "'" : "",
 		            ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(none)",
 		            ssid ? "'" : "");
diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.c b/src/dhcp-manager/nm-dhcp-dhclient-utils.c
index 7991181f90..c95c22308b 100644
--- a/src/dhcp-manager/nm-dhcp-dhclient-utils.c
+++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.c
@@ -246,17 +246,15 @@ nm_dhcp_dhclient_create_config (const char *interface,
 
 	g_string_append_c (new_contents, '\n');
 
-	if (anycast_addr && anycast_addr->len == 6) {
+	if (anycast_addr && anycast_addr->len == ETH_ALEN) {
 		const guint8 *p_anycast_addr = anycast_addr->data;
 
 		g_string_append_printf (new_contents, "interface \"%s\" {\n"
 		                        " initial-interval 1; \n"
-		                        " anycast-mac ethernet %02x:%02x:%02x:%02x:%02x:%02x;\n"
+		                        " anycast-mac ethernet " MAC_FMT ";\n"
 		                        "}\n",
 		                        interface,
-		                        p_anycast_addr[0], p_anycast_addr[1],
-		                        p_anycast_addr[2], p_anycast_addr[3],
-		                        p_anycast_addr[4], p_anycast_addr[5]);
+		                        MAC_ARG (p_anycast_addr));
 	}
 
 	/* Finally, assert that anycast_addr was unset or a 48 bit mac address. */
diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c
index 5eb4b47320..e8673b6262 100644
--- a/src/supplicant-manager/nm-supplicant-config.c
+++ b/src/supplicant-manager/nm-supplicant-config.c
@@ -327,9 +327,6 @@ nm_supplicant_config_get_blobs (NMSupplicantConfig * self)
 	return NM_SUPPLICANT_CONFIG_GET_PRIVATE (self)->blobs;
 }
 
-#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
-#define MAC_ARG(x) ((guint8*)(x))[0],((guint8*)(x))[1],((guint8*)(x))[2],((guint8*)(x))[3],((guint8*)(x))[4],((guint8*)(x))[5]
-
 #define TWO_GHZ_FREQS  "2412,2417,2422,2427,2432,2437,2442,2447,2452,2457,2462,2467,2472,2484"
 #define FIVE_GHZ_FREQS "4915,4920,4925,4935,4940,4945,4960,4980,5035,5040,5045,5055,5060,5080," \
                          "5170,5180,5190,5200,5210,5220,5230,5240,5260,5280,5300,5320,5500," \