net: initialize structs when declaring

[elogind.git] / src / udev / net / ethtool-util.c

diff --git a/src/udev/net/ethtool-util.c b/src/udev/net/ethtool-util.c
index aaba94c2fb71c3da5194f8a482c9e4b91ab09129..63465303231a3dfae0fb918bff710a4607980440 100644 (file)
--- a/src/udev/net/ethtool-util.c
+++ b/src/udev/net/ethtool-util.c
@@ -64,44 +64,44 @@ int ethtool_connect(int *ret) {
 }
 
 int ethtool_get_driver(int fd, const char *ifname, char **ret) {
-        struct ifreq ifr;
-        struct ethtool_drvinfo ecmd;
+        struct ethtool_drvinfo ecmd = {
+                .cmd = ETHTOOL_GDRVINFO
+        };
+        struct ifreq ifr = {
+                .ifr_data = (void*) &ecmd
+        };
+        char *d;
         int r;
 
-        zero(ecmd);
-        ecmd.cmd = ETHTOOL_GDRVINFO;
-
-        zero(ifr);
         strscpy(ifr.ifr_name, IFNAMSIZ, ifname);
-        ifr.ifr_data = (void *)&ecmd;
 
         r = ioctl(fd, SIOCETHTOOL, &ifr);
         if (r < 0)
                 return -errno;
 
-        *ret = strdup(ecmd.driver);
-        if (!*ret)
+        d = strdup(ecmd.driver);
+        if (!d)
                 return -ENOMEM;
 
+        *ret = d;
         return 0;
 }
 
 int ethtool_set_speed(int fd, const char *ifname, unsigned int speed, Duplex duplex)
 {
-        struct ifreq ifr;
-        struct ethtool_cmd ecmd;
+        struct ethtool_cmd ecmd = {
+                .cmd = ETHTOOL_GSET
+        };
+        struct ifreq ifr = {
+                .ifr_data = (void*) &ecmd
+        };
         bool need_update = false;
         int r;
 
         if (speed == 0 && duplex == _DUP_INVALID)
                 return 0;
 
-        zero(ecmd);
-        ecmd.cmd = ETHTOOL_GSET;
-
-        zero(ifr);
         strscpy(ifr.ifr_name, IFNAMSIZ, ifname);
-        ifr.ifr_data = (void *)&ecmd;
 
         r = ioctl(fd, SIOCETHTOOL, &ifr);
         if (r < 0)
@@ -141,20 +141,19 @@ int ethtool_set_speed(int fd, const char *ifname, unsigned int speed, Duplex dup
 }
 
 int ethtool_set_wol(int fd, const char *ifname, WakeOnLan wol) {
-        struct ifreq ifr;
-        struct ethtool_wolinfo ecmd;
+        struct ethtool_wolinfo ecmd = {
+                .cmd = ETHTOOL_GWOL
+        };
+        struct ifreq ifr = {
+                .ifr_data = (void*) &ecmd
+        };
         bool need_update = false;
         int r;
 
         if (wol == _WOL_INVALID)
                 return 0;
 
-        zero(ecmd);
-        ecmd.cmd = ETHTOOL_GWOL;
-
-        zero(ifr);
         strscpy(ifr.ifr_name, IFNAMSIZ, ifname);
-        ifr.ifr_data = (void *)&ecmd;
 
         r = ioctl(fd, SIOCETHTOOL, &ifr);
         if (r < 0)