X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fethstat.c;h=b30f614eab93460d7db4cc87d68d67c71d046b7f;hb=52969b45cee18330d72b9fafe1f37349d62414b6;hp=959737a368add51263a93c1caf6fb9cab4b7c3bb;hpb=21ab7512825cf8177d5eee5101344b45d0854610;p=collectd.git

diff --git a/src/ethstat.c b/src/ethstat.c
index 959737a3..b30f614e 100644
--- a/src/ethstat.c
+++ b/src/ethstat.c
@@ -216,8 +216,6 @@ static void ethstat_submit_value (const char *device,
 static int ethstat_read_interface (char *device)
 {
   int fd;
-  struct ifreq req;
-  struct ethtool_drvinfo drvinfo;
   struct ethtool_gstrings *strings;
   struct ethtool_stats *stats;
   size_t n_stats;
@@ -226,9 +224,6 @@ static int ethstat_read_interface (char *device)
   size_t i;
   int status;
 
-  memset (&req, 0, sizeof (req));
-  sstrncpy(req.ifr_name, device, sizeof (req.ifr_name));
-
   fd = socket(AF_INET, SOCK_DGRAM, /* protocol = */ 0);
   if (fd < 0)
   {
@@ -238,9 +233,16 @@ static int ethstat_read_interface (char *device)
     return 1;
   }
 
-  memset (&drvinfo, 0, sizeof (drvinfo));
-  drvinfo.cmd = ETHTOOL_GDRVINFO;
-  req.ifr_data = (void *) &drvinfo;
+  struct ethtool_drvinfo drvinfo = {
+    .cmd = ETHTOOL_GDRVINFO
+  };
+
+  struct ifreq req = {
+    .ifr_data = (void *) &drvinfo
+  };
+
+  sstrncpy(req.ifr_name, device, sizeof (req.ifr_name));
+
   status = ioctl (fd, SIOCETHTOOL, &req);
   if (status < 0)
   {