picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

net: initialize structs when declaring them/do not clobber caller variables

Browse source 
Just two minor style fixes...
This commit is contained in:
Lennart Poettering 2014-02-21 21:23:40 +01:00
parent ed4ba7e4f6
commit 61f3af4fed
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/udev/net/ethtool-util.c
View file

@ -64,25 +64,26 @@ 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;
}