oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

remove some warnings from the linux-portion

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11397 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2002-09-05 03:36:23 +00:00
parent 73aa6bce70
commit f4b53cdfee
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/roken/getifaddrs.c
View File

@@ -208,6 +208,7 @@ ifa_make_sockaddr(sa_family_t family,
#endif #endif
} }
#ifndef IFA_NETMASK
static struct sockaddr * static struct sockaddr *
ifa_make_sockaddr_mask(sa_family_t family, ifa_make_sockaddr_mask(sa_family_t family,
struct sockaddr *sa, struct sockaddr *sa,
@@ -253,6 +254,7 @@ ifa_make_sockaddr_mask(sa_family_t family,
} }
return sa; return sa;
} }
#endif
/* ====================================================================== */ /* ====================================================================== */
static int static int
@@ -512,15 +514,17 @@ int getifaddrs(struct ifaddrs **ifap)
for (build=0; build<=1; build++){ for (build=0; build<=1; build++){
struct ifaddrs *ifl = NULL, *ifa = NULL; struct ifaddrs *ifl = NULL, *ifa = NULL;
struct nlmsghdr *nlh, *nlh0; struct nlmsghdr *nlh, *nlh0;
void *data = NULL, *xdata = NULL, *ifdata = NULL; char *data = NULL, *xdata = NULL;
void *ifdata = NULL;
char *ifname = NULL, **iflist = NULL; char *ifname = NULL, **iflist = NULL;
uint16_t *ifflist = NULL; uint16_t *ifflist = NULL;
struct rtmaddr_ifamap ifamap; struct rtmaddr_ifamap ifamap;
if (build){ if (build){
ifa = data = calloc(1, data = calloc(1,
NLMSG_ALIGN(sizeof(struct ifaddrs[icnt])) NLMSG_ALIGN(sizeof(struct ifaddrs[icnt]))
+ dlen + xlen + nlen); + dlen + xlen + nlen);
ifa = (struct ifaddrs *)data;
ifdata = calloc(1, ifdata = calloc(1,
NLMSG_ALIGN(sizeof(char *[max_ifindex+1])) NLMSG_ALIGN(sizeof(char *[max_ifindex+1]))
+ NLMSG_ALIGN(sizeof(uint16_t [max_ifindex+1]))); + NLMSG_ALIGN(sizeof(uint16_t [max_ifindex+1])));
@@ -541,7 +545,7 @@ int getifaddrs(struct ifaddrs **ifap)
xdata = data + dlen; xdata = data + dlen;
ifname = xdata + xlen; ifname = xdata + xlen;
iflist = ifdata; iflist = ifdata;
ifflist = ((void *)iflist) + NLMSG_ALIGN(sizeof(char *[max_ifindex+1])); ifflist = (uint16_t *)(((char *)iflist) + NLMSG_ALIGN(sizeof(char *[max_ifindex+1])));
} }
for (nlm=nlmsg_list; nlm; nlm=nlm->nlm_next){ for (nlm=nlmsg_list; nlm; nlm=nlm->nlm_next){