moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

if2ip.c: fix compiler warning 'enumerated type is mixed with another type'

Browse Source
This commit is contained in:
Yang Tse 2011-12-13 15:47:26 +01:00
parent 6e4835c795
commit 07efe110cc
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/if2ip.c
View File

@ -92,7 +92,7 @@ bool Curl_if_is_interface_name(const char *interface)
char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size) char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size)
{ {
struct ifaddrs *iface, *head; struct ifaddrs *iface, *head;
char *ip=NULL; char *ip = NULL;
if(getifaddrs(&head) >= 0) { if(getifaddrs(&head) >= 0) {
for(iface=head; iface != NULL; iface=iface->ifa_next) { for(iface=head; iface != NULL; iface=iface->ifa_next) {
@ -132,7 +132,9 @@ bool Curl_if_is_interface_name(const char *interface)
/* This is here just to support the old interfaces */ /* This is here just to support the old interfaces */
char buf[256]; char buf[256];
return (Curl_if2ip(AF_INET, interface, buf, sizeof(buf)) != NULL); char *ip = Curl_if2ip(AF_INET, interface, buf, sizeof(buf));
return (ip != NULL) ? TRUE : FALSE;
} }
char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size) char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size)

8
lib/if2ip.h
View File

@ -1,5 +1,5 @@
#ifndef __IF2IP_H #ifndef HEADER_CURL_IF2IP_H
#define __IF2IP_H #define HEADER_CURL_IF2IP_H
/*************************************************************************** /***************************************************************************
* _ _ ____ _ * _ _ ____ _
* Project ___| | | | _ \| | * Project ___| | | | _ \| |
@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -63,4 +63,4 @@ struct ifreq {
#define SIOCGIFADDR _IOW('s', 102, struct ifreq) /* Get if addr */ #define SIOCGIFADDR _IOW('s', 102, struct ifreq) /* Get if addr */
#endif /* interix */ #endif /* interix */
#endif #endif /* HEADER_CURL_IF2IP_H */