mirror of
https://github.com/samba-team/samba.git
synced 2025-02-02 09:47:23 +03:00
libreplace: fix compile errors in getifaddrs.c
Michael (This used to be commit 22cdd4cb507022d9c670b7d5cbc8d357b0b91637)
This commit is contained in:
parent
357659b1d0
commit
bf6dbf8e1b
@ -81,7 +81,6 @@ int rep_getifaddrs(struct ifaddrs **ifap)
|
|||||||
char buff[8192];
|
char buff[8192];
|
||||||
int fd, i, n;
|
int fd, i, n;
|
||||||
struct ifreq *ifr=NULL;
|
struct ifreq *ifr=NULL;
|
||||||
int total = 0;
|
|
||||||
struct in_addr ipaddr;
|
struct in_addr ipaddr;
|
||||||
struct in_addr nmask;
|
struct in_addr nmask;
|
||||||
char *iname;
|
char *iname;
|
||||||
@ -106,7 +105,7 @@ int rep_getifaddrs(struct ifaddrs **ifap)
|
|||||||
n = ifc.ifc_len / sizeof(struct ifreq);
|
n = ifc.ifc_len / sizeof(struct ifreq);
|
||||||
|
|
||||||
/* Loop through interfaces, looking for given IP address */
|
/* Loop through interfaces, looking for given IP address */
|
||||||
for (i=n-1;i>=0 && total < max_interfaces;i--) {
|
for (i=n-1; i>=0; i--) {
|
||||||
if (ioctl(fd, SIOCGIFADDR, &ifr[i]) != 0) {
|
if (ioctl(fd, SIOCGIFADDR, &ifr[i]) != 0) {
|
||||||
freeifaddrs(*ifap);
|
freeifaddrs(*ifap);
|
||||||
}
|
}
|
||||||
@ -166,11 +165,10 @@ int rep_getifaddrs(struct ifaddrs **ifap)
|
|||||||
char buff[8192];
|
char buff[8192];
|
||||||
int fd, i, n;
|
int fd, i, n;
|
||||||
struct ifreq *ifr=NULL;
|
struct ifreq *ifr=NULL;
|
||||||
int total = 0;
|
|
||||||
struct in_addr ipaddr;
|
struct in_addr ipaddr;
|
||||||
struct in_addr nmask;
|
struct in_addr nmask;
|
||||||
char *iname;
|
char *iname;
|
||||||
struct ifaddrs *curif;
|
struct ifaddrs *curif, *lastif;
|
||||||
|
|
||||||
*ifap = NULL;
|
*ifap = NULL;
|
||||||
|
|
||||||
@ -201,7 +199,7 @@ int rep_getifaddrs(struct ifaddrs **ifap)
|
|||||||
|
|
||||||
/* Loop through interfaces */
|
/* Loop through interfaces */
|
||||||
|
|
||||||
for (i = 0; i<n && total < max_interfaces; i++) {
|
for (i = 0; i<n; i++) {
|
||||||
ifreq = ifr[i];
|
ifreq = ifr[i];
|
||||||
|
|
||||||
curif = calloc(1, sizeof(struct ifaddrs));
|
curif = calloc(1, sizeof(struct ifaddrs));
|
||||||
@ -270,7 +268,6 @@ int rep_getifaddrs(struct ifaddrs **ifap)
|
|||||||
struct in_addr ipaddr;
|
struct in_addr ipaddr;
|
||||||
struct in_addr nmask;
|
struct in_addr nmask;
|
||||||
char *iname;
|
char *iname;
|
||||||
int total = 0;
|
|
||||||
struct ifaddrs *curif, *lastif;
|
struct ifaddrs *curif, *lastif;
|
||||||
|
|
||||||
*ifap = NULL;
|
*ifap = NULL;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user