coding style consistency

[catta] / src / iface-windows.c

diff --git a/src/iface-windows.c b/src/iface-windows.c
index e3ca771b212c02dc8af671b72c48fa14d2774558..833112f4b49c8105f3c6f2fd5380a306275ce1b0 100644 (file)
--- a/src/iface-windows.c
+++ b/src/iface-windows.c
@@ -20,6 +20,7 @@
 #include "iface-windows.h"
 #include "iface.h"
 
+#include <stdlib.h> // wcstombs
 #include <catta/malloc.h>
 #include <catta/log.h>
 #include <iphlpapi.h>
@@ -76,6 +77,7 @@ static void ip_adapter_address(CattaInterfaceMonitor *m, IP_ADAPTER_ADDRESSES *p
 {
     CattaIfIndex idx;
     CattaHwInterface *hw;
+    size_t n;
 
     // look up the interface index by LUID
     if((idx = find_ifindex(m, p->Luid)) < 0) {
@@ -99,14 +101,16 @@ static void ip_adapter_address(CattaInterfaceMonitor *m, IP_ADAPTER_ADDRESSES *p
         (m->server->config.allow_point_to_point || !(p->IfType & IF_TYPE_PPP));
             // XXX what about IF_TYPE_TUNNEL?
 
+    n = wcstombs(NULL, p->FriendlyName, 0) + 1;
     catta_free(hw->name);
-    hw->name = catta_strdup(p->AdapterName);
+    hw->name = catta_new(char, n);
+    wcstombs(hw->name, p->FriendlyName, n);
 
     hw->mtu = p->Mtu;
 
     hw->mac_address_size = p->PhysicalAddressLength;
-    if (hw->mac_address_size > CATTA_MAC_ADDRESS_MAX)
-      hw->mac_address_size = CATTA_MAC_ADDRESS_MAX;
+    if(hw->mac_address_size > CATTA_MAC_ADDRESS_MAX)
+        hw->mac_address_size = CATTA_MAC_ADDRESS_MAX;
     memcpy(hw->mac_address, p->PhysicalAddress, hw->mac_address_size);
 
     // XXX process addresses