summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authortuexen <tuexen@FreeBSD.org>2016-01-16 14:56:30 +0000
committertuexen <tuexen@FreeBSD.org>2016-01-16 14:56:30 +0000
commitbc1e3287c3f8c8833ec8e749018df75bd7cc31e1 (patch)
tree99e6a553aac790e216316cf4b8ca293286b9e83e /lib
parent52bf51b039b2ca7f948c15911d8dddf6153c7b15 (diff)
downloadFreeBSD-src-bc1e3287c3f8c8833ec8e749018df75bd7cc31e1.zip
FreeBSD-src-bc1e3287c3f8c8833ec8e749018df75bd7cc31e1.tar.gz
MFC r287619:
Zero out a local variable also when PURIFY is not defined. This silence a warning brought up by valgrind whenever if_nametoindex is used. This was already discussed in PR 166483, but the code committed in r234329 guards the initilization with #ifdef PURIFY. Therefore, valgrind still complains. Since this code is not performance critical, always zero out the local variable to silence valgrind.
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/net/if_nametoindex.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/libc/net/if_nametoindex.c b/lib/libc/net/if_nametoindex.c
index 8f04921..debf3fa 100644
--- a/lib/libc/net/if_nametoindex.c
+++ b/lib/libc/net/if_nametoindex.c
@@ -70,9 +70,7 @@ if_nametoindex(const char *ifname)
s = _socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
if (s != -1) {
-#ifdef PURIFY
memset(&ifr, 0, sizeof(ifr));
-#endif
strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
if (_ioctl(s, SIOCGIFINDEX, &ifr) != -1) {
_close(s);
OpenPOWER on IntegriCloud