aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2011-12-13 15:47:26 +0100
committerYang Tse <yangsita@gmail.com>2011-12-13 15:47:26 +0100
commit07efe110cc7dce18e6ef4ff73b1acbd30842471c (patch)
treeb402ba9123a9136c1af77039a276c631cc34e854
parent6e4835c795996ee92ac1aa78733f23a089f310a5 (diff)
if2ip.c: fix compiler warning 'enumerated type is mixed with another type'
-rw-r--r--lib/if2ip.c6
-rw-r--r--lib/if2ip.h8
2 files changed, 8 insertions, 6 deletions
diff --git a/lib/if2ip.c b/lib/if2ip.c
index 0ae375b15..864fcb3fa 100644
--- a/lib/if2ip.c
+++ b/lib/if2ip.c
@@ -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)
{
struct ifaddrs *iface, *head;
- char *ip=NULL;
+ char *ip = NULL;
if(getifaddrs(&head) >= 0) {
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 */
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)
diff --git a/lib/if2ip.h b/lib/if2ip.h
index 678e3a556..8b1979ba7 100644
--- a/lib/if2ip.h
+++ b/lib/if2ip.h
@@ -1,5 +1,5 @@
-#ifndef __IF2IP_H
-#define __IF2IP_H
+#ifndef HEADER_CURL_IF2IP_H
+#define HEADER_CURL_IF2IP_H
/***************************************************************************
* _ _ ____ _
* 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
* 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 */
#endif /* interix */
-#endif
+#endif /* HEADER_CURL_IF2IP_H */