Fix compiler warnings.

[tinc] / src / linux / device.c

diff --git a/src/linux/device.c b/src/linux/device.c
index 54ea5dc..0abafa9 100644 (file)
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -103,10 +103,12 @@ static bool setup_device(void) {
 
        if(iface) {
                strncpy(ifr.ifr_name, iface, IFNAMSIZ);
+               ifr.ifr_name[IFNAMSIZ - 1] = 0;
        }
 
        if(!ioctl(device_fd, TUNSETIFF, &ifr)) {
                strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
+               ifrname[IFNAMSIZ - 1] = 0;
                free(iface);
                iface = xstrdup(ifrname);
        } else {
@@ -117,7 +119,7 @@ static bool setup_device(void) {
        logger(DEBUG_ALWAYS, LOG_INFO, "%s is a %s", device, device_info);
 
        if(ifr.ifr_flags & IFF_TAP) {
-               struct ifreq ifr_mac = {};
+               struct ifreq ifr_mac = {{{0}}};
 
                if(!ioctl(device_fd, SIOCGIFHWADDR, &ifr_mac)) {
                        memcpy(mymac.x, ifr_mac.ifr_hwaddr.sa_data, ETH_ALEN);