diff options
| author |   Jeremie Corbier <jeremie.corbier@resel.enst-bretagne.fr> | 2010-03-25 10:07:03 +0100 |
|---|---|---|
| committer |   Bjørn Mork <bjorn@mork.no> | 2010-08-06 15:37:37 +0200 |
| commit | aeedae61d12778c4428a7e266913221269480162 (patch) | |
| tree | 023ce3b78a8d62a129032fc6028d457f5e9199c1 /if.c | |
| parent | 2fa86d0c611b69e175c3b07116e9b67b85fe20ef (diff) | |
102_libc6-2.9-fixes.diff from the Debian package version 20080615-8:
"Fixes for recent libc releases."
[ignoring changes to the build generated cftoken.c file]
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Diffstat (limited to 'if.c')
| -rw-r--r-- | if.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -60,12 +60,12 @@ ifinit(ifname) struct dhcp6_if *ifp; if ((ifp = find_ifconfbyname(ifname)) != NULL) { - dprintf(LOG_NOTICE, FNAME, "duplicated interface: %s", ifname); + debug_printf(LOG_NOTICE, FNAME, "duplicated interface: %s", ifname); return (NULL); } if ((ifp = malloc(sizeof(*ifp))) == NULL) { - dprintf(LOG_ERR, FNAME, "malloc failed"); + debug_printf(LOG_ERR, FNAME, "malloc failed"); goto fail; } memset(ifp, 0, sizeof(*ifp)); @@ -73,7 +73,7 @@ ifinit(ifname) TAILQ_INIT(&ifp->event_list); if ((ifp->ifname = strdup(ifname)) == NULL) { - dprintf(LOG_ERR, FNAME, "failed to copy ifname"); + debug_printf(LOG_ERR, FNAME, "failed to copy ifname"); goto fail; } @@ -92,7 +92,7 @@ ifinit(ifname) struct sockaddr_in6 *sin6; if (getifaddrs(&ifap) < 0) { - dprintf(LOG_ERR, FNAME, "getifaddrs failed: %s", + debug_printf(LOG_ERR, FNAME, "getifaddrs failed: %s", strerror(errno)); goto fail; } @@ -134,14 +134,14 @@ ifreset(ifp) u_int32_t linkid; if ((ifid = if_nametoindex(ifp->ifname)) == 0) { - dprintf(LOG_ERR, FNAME, "invalid interface(%s): %s", + debug_printf(LOG_ERR, FNAME, "invalid interface(%s): %s", ifp->ifname, strerror(errno)); return (-1); } #ifdef HAVE_SCOPELIB if (inet_zoneid(AF_INET6, 2, ifname, &linkid)) { - dprintf(LOG_ERR, FNAME, "failed to get link ID for %s", + debug_printf(LOG_ERR, FNAME, "failed to get link ID for %s", ifname); return (-1); } |