From: 2xsec Date: Tue, 2 Oct 2018 09:55:33 +0000 (+0900) Subject: netns_iaddrs: remove unused functions X-Git-Tag: lxc-3.1.0~71^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2666%2Fhead;p=thirdparty%2Flxc.git netns_iaddrs: remove unused functions Signed-off-by: 2xsec --- diff --git a/src/include/netns_ifaddrs.c b/src/include/netns_ifaddrs.c index 8291660e4..cc672a7fd 100644 --- a/src/include/netns_ifaddrs.c +++ b/src/include/netns_ifaddrs.c @@ -495,44 +495,6 @@ static int __rtnl_enumerate(int link_af, int addr_af, __s32 netns_id, return r; } -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wcast-align" -/* Get a pointer to the address structure from a sockaddr. */ -static void *get_addr_ptr(struct sockaddr *sockaddr_ptr) -{ - if (sockaddr_ptr->sa_family == AF_INET) - return &((struct sockaddr_in *)sockaddr_ptr)->sin_addr; - - if (sockaddr_ptr->sa_family == AF_INET6) - return &((struct sockaddr_in6 *)sockaddr_ptr)->sin6_addr; - - return NULL; -} -#pragma GCC diagnostic pop - -static char *get_packet_address(struct sockaddr *sockaddr_ptr, char *buf, size_t buflen) -{ - char *slider = buf; -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wcast-align" - unsigned char *m = ((struct sockaddr_ll *)sockaddr_ptr)->sll_addr; - unsigned char n = ((struct sockaddr_ll *)sockaddr_ptr)->sll_halen; -#pragma GCC diagnostic pop - - for (unsigned char i = 0; i < n; i++) { - int ret; - - ret = snprintf(slider, buflen, "%02x%s", m[i], (i + 1) < n ? ":" : ""); - if (ret < 0 || (size_t)ret >= buflen) - return NULL; - - buflen -= ret; - slider = (slider + ret); - } - - return buf; -} - void netns_freeifaddrs(struct netns_ifaddrs *ifp) { struct netns_ifaddrs *n;