diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-17 08:20:29 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:50:51 +0100 |
| commit | 83655ec0dd58c21cdb99d5e7c8008b4b3087449b (patch) | |
| tree | fa8bb67f3aab3eb28f62b955c79059e941785284 | |
| parent | b0360e3a8617c59661d0b0fd805666e6cefcd811 (diff) | |
| download | samba-83655ec0dd58c21cdb99d5e7c8008b4b3087449b.tar.gz samba-83655ec0dd58c21cdb99d5e7c8008b4b3087449b.tar.bz2 samba-83655ec0dd58c21cdb99d5e7c8008b4b3087449b.zip | |
r26497: Fix return type for freeifaddrs().
(This used to be commit 8c65053f51330bb55a81572264eefbcc56029dc1)
| -rw-r--r-- | source4/lib/replace/getifaddrs.c | 12 | ||||
| -rw-r--r-- | source4/lib/replace/system/network.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source4/lib/replace/getifaddrs.c b/source4/lib/replace/getifaddrs.c index c9b5c2f6ef..4037d647d7 100644 --- a/source4/lib/replace/getifaddrs.c +++ b/source4/lib/replace/getifaddrs.c @@ -40,7 +40,7 @@ #define _FOUND_IFACE_ANY #else -void freeifaddrs(struct ifaddrs *ifp) +void rep_freeifaddrs(struct ifaddrs *ifp) { free(ifp->ifa_name); free(ifp->ifa_addr); @@ -51,7 +51,7 @@ void freeifaddrs(struct ifaddrs *ifp) free(ifp); } -struct sockaddr *sockaddr_dup(struct sockaddr *sa) +static struct sockaddr *sockaddr_dup(struct sockaddr *sa) { struct sockaddr *ret; socklen_t socklen; @@ -75,7 +75,7 @@ struct sockaddr *sockaddr_dup(struct sockaddr *sa) It probably also works on any BSD style system. */ -int getifaddrs(struct ifaddrs **ifap) +int rep_getifaddrs(struct ifaddrs **ifap) { struct ifconf ifc; char buff[8192]; @@ -159,7 +159,7 @@ int getifaddrs(struct ifaddrs **ifap) this should cover most of the streams based systems Thanks to Andrej.Borsenkow@mow.siemens.ru for several ideas in this code ****************************************************************************/ -int getifaddrs(struct ifaddrs **ifap) +int rep_getifaddrs(struct ifaddrs **ifap) { struct ifreq ifreq; struct strioctl strioctl; @@ -261,7 +261,7 @@ int getifaddrs(struct ifaddrs **ifap) /**************************************************************************** this one is for AIX (tested on 4.2) ****************************************************************************/ -int getifaddrs(struct ifaddrs **ifap) +int rep_getifaddrs(struct ifaddrs **ifap) { char buff[8192]; int fd, i; @@ -355,7 +355,7 @@ int getifaddrs(struct ifaddrs **ifap) #define _FOUND_IFACE_ANY #endif /* HAVE_IFACE_AIX */ #ifndef _FOUND_IFACE_ANY -int getifaddrs(struct ifaddrs **ifap) +int rep_getifaddrs(struct ifaddrs **ifap) { errno = ENOSYS; return -1; diff --git a/source4/lib/replace/system/network.h b/source4/lib/replace/system/network.h index c340cca657..853c2a38bb 100644 --- a/source4/lib/replace/system/network.h +++ b/source4/lib/replace/system/network.h @@ -116,7 +116,7 @@ int rep_getifaddrs(struct ifaddrs **); #endif #ifndef HAVE_FREEIFADDRS -int rep_freeifaddrs(struct ifaddrs **); +void rep_freeifaddrs(struct ifaddrs **); #endif /* |