diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-17 08:20:29 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-02-19 21:59:51 +0100 |
| commit | f822f4150b2b04619d68686ffdb72e82310a7175 (patch) | |
| tree | 5bbd197f3016e5b4be8cb9b05b97bbd1413b525b | |
| parent | 1caa9cbd9dd1449c00fa431e129e1d070f4aac80 (diff) | |
| download | samba-f822f4150b2b04619d68686ffdb72e82310a7175.tar.gz samba-f822f4150b2b04619d68686ffdb72e82310a7175.tar.bz2 samba-f822f4150b2b04619d68686ffdb72e82310a7175.zip | |
r26497: Fix return type for freeifaddrs().
(cherry picked from commit 8c65053f51330bb55a81572264eefbcc56029dc1)
(This used to be commit 57587e49f5942b81508b40e3c9a67e7536f2271d)
| -rw-r--r-- | source3/lib/replace/getifaddrs.c | 12 | ||||
| -rw-r--r-- | source3/lib/replace/system/network.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source3/lib/replace/getifaddrs.c b/source3/lib/replace/getifaddrs.c index c9b5c2f6ef..4037d647d7 100644 --- a/source3/lib/replace/getifaddrs.c +++ b/source3/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/source3/lib/replace/system/network.h b/source3/lib/replace/system/network.h index e03c991b3c..fa5ec9a680 100644 --- a/source3/lib/replace/system/network.h +++ b/source3/lib/replace/system/network.h @@ -120,7 +120,7 @@ int rep_getifaddrs(struct ifaddrs **); #endif #ifndef HAVE_FREEIFADDRS -int rep_freeifaddrs(struct ifaddrs **); +void rep_freeifaddrs(struct ifaddrs **); #endif /* |