svn commit: samba r26497 - in branches/SAMBA_4_0: . source/lib/replace source/lib/replace/system

[jelmer at samba.org]

Author: jelmer
Date: 2007-12-17 08:20:29 +0000 (Mon, 17 Dec 2007)
New Revision: 26497

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26497

Log:
Fix return type for freeifaddrs().
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/replace/getifaddrs.c
   branches/SAMBA_4_0/source/lib/replace/system/network.h


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/lib/replace/getifaddrs.c
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/getifaddrs.c	2007-12-17 08:20:20 UTC (rev 26496)
+++ branches/SAMBA_4_0/source/lib/replace/getifaddrs.c	2007-12-17 08:20:29 UTC (rev 26497)
@@ -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 @@
 	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 @@
 
    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 @@
 this should cover most of the streams based systems
 Thanks to Andrej.Borsenkow at 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 @@
 /****************************************************************************
 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 @@
 #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;

Modified: branches/SAMBA_4_0/source/lib/replace/system/network.h
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/system/network.h	2007-12-17 08:20:20 UTC (rev 26496)
+++ branches/SAMBA_4_0/source/lib/replace/system/network.h	2007-12-17 08:20:29 UTC (rev 26497)
@@ -116,7 +116,7 @@
 #endif
 
 #ifndef HAVE_FREEIFADDRS
-int rep_freeifaddrs(struct ifaddrs **);
+void rep_freeifaddrs(struct ifaddrs **);
 #endif
 
 /*