From 556059bf80e3a368811fd46fe2b6e35104d0eda3 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Mon, 18 Nov 2019 00:07:52 -0600 Subject: Qt UI: Factor out MAC address stringify to function --- ui/qt5/horizonwizard.cc | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'ui/qt5/horizonwizard.cc') diff --git a/ui/qt5/horizonwizard.cc b/ui/qt5/horizonwizard.cc index 2679a6e..7a64d2a 100644 --- a/ui/qt5/horizonwizard.cc +++ b/ui/qt5/horizonwizard.cc @@ -126,16 +126,7 @@ std::map probe_ifaces(void) { memcpy(&request.ifr_name, cifname, strnlen(cifname, IFNAMSIZ)); errno = 0; if(ioctl(my_sock, SIOCGIFHWADDR, &request) != -1) { - char *buf; - asprintf(&buf, "%02X:%02X:%02X:%02X:%02X:%02X", - request.ifr_ifru.ifru_hwaddr.sa_data[0], - request.ifr_ifru.ifru_hwaddr.sa_data[1], - request.ifr_ifru.ifru_hwaddr.sa_data[2], - request.ifr_ifru.ifru_hwaddr.sa_data[3], - request.ifr_ifru.ifru_hwaddr.sa_data[4], - request.ifr_ifru.ifru_hwaddr.sa_data[5]); - mac = QString(buf); - free(buf); + mac = fromMacAddress(request.ifr_ifru.ifru_hwaddr.sa_data); } ::close(my_sock); } -- cgit v1.2.3-60-g2f50