aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ares/adig.c1
-rw-r--r--ares/ahost.c1
-rw-r--r--ares/ares__get_hostent.c1
-rw-r--r--ares/ares_expand_name.c1
-rw-r--r--ares/ares_expand_string.c1
-rw-r--r--ares/ares_fds.c1
-rw-r--r--ares/ares_gethostbyaddr.c5
-rw-r--r--ares/ares_gethostbyname.c5
-rw-r--r--ares/ares_getnameinfo.c2
-rw-r--r--ares/ares_getsock.c1
-rw-r--r--ares/ares_init.c1
-rw-r--r--ares/ares_mkquery.c1
-rw-r--r--ares/ares_parse_a_reply.c1
-rw-r--r--ares/ares_parse_aaaa_reply.c1
-rw-r--r--ares/ares_parse_ns_reply.c1
-rw-r--r--ares/ares_parse_ptr_reply.c1
-rw-r--r--ares/ares_process.c1
-rw-r--r--ares/ares_query.c1
-rw-r--r--ares/ares_send.c1
-rw-r--r--ares/ares_timeout.c1
-rw-r--r--ares/bitncmp.c4
-rw-r--r--ares/inet_net_pton.c3
-rw-r--r--ares/inet_ntop.c2
23 files changed, 5 insertions, 33 deletions
diff --git a/ares/adig.c b/ares/adig.c
index 65213780b..f42249606 100644
--- a/ares/adig.c
+++ b/ares/adig.c
@@ -16,7 +16,6 @@
*/
#include "setup.h"
-#include <sys/types.h>
#if defined(WIN32) && !defined(WATT32)
#include "nameser.h"
diff --git a/ares/ahost.c b/ares/ahost.c
index 2fa6dac76..10680d216 100644
--- a/ares/ahost.c
+++ b/ares/ahost.c
@@ -16,7 +16,6 @@
*/
#include "setup.h"
-#include <sys/types.h>
#if !defined(WIN32) || defined(WATT32)
#ifdef HAVE_SYS_TIME_H
diff --git a/ares/ares__get_hostent.c b/ares/ares__get_hostent.c
index 333cf505e..312a678ec 100644
--- a/ares/ares__get_hostent.c
+++ b/ares/ares__get_hostent.c
@@ -16,7 +16,6 @@
*/
#include "setup.h"
-#include <sys/types.h>
#if !defined(WIN32) || defined(WATT32)
#include <sys/socket.h>
diff --git a/ares/ares_expand_name.c b/ares/ares_expand_name.c
index a08c81d7e..7fe025fe4 100644
--- a/ares/ares_expand_name.c
+++ b/ares/ares_expand_name.c
@@ -16,7 +16,6 @@
*/
#include "setup.h"
-#include <sys/types.h>
#if defined(WIN32) && !defined(WATT32)
#include "nameser.h"
diff --git a/ares/ares_expand_string.c b/ares/ares_expand_string.c
index 0a4343d40..0c7211ba2 100644
--- a/ares/ares_expand_string.c
+++ b/ares/ares_expand_string.c
@@ -16,7 +16,6 @@
*/
#include "setup.h"
-#include <sys/types.h>
#if defined(WIN32) && !defined(WATT32)
#include "nameser.h"
diff --git a/ares/ares_fds.c b/ares/ares_fds.c
index 67bf31322..e8d2ee28b 100644
--- a/ares/ares_fds.c
+++ b/ares/ares_fds.c
@@ -16,7 +16,6 @@
*/
#include "setup.h"
-#include <sys/types.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
diff --git a/ares/ares_gethostbyaddr.c b/ares/ares_gethostbyaddr.c
index db0ac46b3..7ea7ebbc0 100644
--- a/ares/ares_gethostbyaddr.c
+++ b/ares/ares_gethostbyaddr.c
@@ -15,7 +15,6 @@
* without express or implied warranty.
*/
#include "setup.h"
-#include <sys/types.h>
#if defined(WIN32) && !defined(WATT32)
#include "nameser.h"
@@ -221,7 +220,7 @@ static int file_lookup(union ares_addr *addr, int family, struct hostent **host)
if (!fp)
{
error = ERRNO;
- switch(error)
+ switch(error)
{
case ENOENT:
case ESRCH:
@@ -229,7 +228,7 @@ static int file_lookup(union ares_addr *addr, int family, struct hostent **host)
default:
DEBUGF(fprintf(stderr, "fopen() failed with error: %d %s\n",
error, strerror(error)));
- DEBUGF(fprintf(stderr, "Error opening file: %s\n",
+ DEBUGF(fprintf(stderr, "Error opening file: %s\n",
PATH_HOSTS));
*host = NULL;
return ARES_EFILE;
diff --git a/ares/ares_gethostbyname.c b/ares/ares_gethostbyname.c
index 1bd5ac95d..c0fa4743a 100644
--- a/ares/ares_gethostbyname.c
+++ b/ares/ares_gethostbyname.c
@@ -16,7 +16,6 @@
*/
#include "setup.h"
-#include <sys/types.h>
#if defined(WIN32) && !defined(WATT32)
#include "nameser.h"
@@ -283,7 +282,7 @@ static int file_lookup(const char *name, int family, struct hostent **host)
if (!fp)
{
error = ERRNO;
- switch(error)
+ switch(error)
{
case ENOENT:
case ESRCH:
@@ -291,7 +290,7 @@ static int file_lookup(const char *name, int family, struct hostent **host)
default:
DEBUGF(fprintf(stderr, "fopen() failed with error: %d %s\n",
error, strerror(error)));
- DEBUGF(fprintf(stderr, "Error opening file: %s\n",
+ DEBUGF(fprintf(stderr, "Error opening file: %s\n",
PATH_HOSTS));
*host = NULL;
return ARES_EFILE;
diff --git a/ares/ares_getnameinfo.c b/ares/ares_getnameinfo.c
index a63c9b6ad..8d10cfc11 100644
--- a/ares/ares_getnameinfo.c
+++ b/ares/ares_getnameinfo.c
@@ -15,8 +15,6 @@
* without express or implied warranty.
*/
#include "setup.h"
-#include <sys/types.h>
-#include <ctype.h>
#if defined(WIN32) && !defined(WATT32)
#include "nameser.h"
diff --git a/ares/ares_getsock.c b/ares/ares_getsock.c
index a6288e986..2b54887be 100644
--- a/ares/ares_getsock.c
+++ b/ares/ares_getsock.c
@@ -14,7 +14,6 @@
*/
#include "setup.h"
-#include <sys/types.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
diff --git a/ares/ares_init.c b/ares/ares_init.c
index 8f78fa445..552f51f48 100644
--- a/ares/ares_init.c
+++ b/ares/ares_init.c
@@ -16,7 +16,6 @@
*/
#include "setup.h"
-#include <sys/types.h>
#if defined(WIN32) && !defined(WATT32)
#include "nameser.h"
diff --git a/ares/ares_mkquery.c b/ares/ares_mkquery.c
index 8fcf35a17..cfd15a997 100644
--- a/ares/ares_mkquery.c
+++ b/ares/ares_mkquery.c
@@ -16,7 +16,6 @@
*/
#include "setup.h"
-#include <sys/types.h>
#if defined(WIN32) && !defined(WATT32)
#include "nameser.h"
diff --git a/ares/ares_parse_a_reply.c b/ares/ares_parse_a_reply.c
index 54b5151c6..6f4275022 100644
--- a/ares/ares_parse_a_reply.c
+++ b/ares/ares_parse_a_reply.c
@@ -16,7 +16,6 @@
*/
#include "setup.h"
-#include <sys/types.h>
#if defined(WIN32) && !defined(WATT32)
#include "nameser.h"
diff --git a/ares/ares_parse_aaaa_reply.c b/ares/ares_parse_aaaa_reply.c
index 036db2801..535d40ee0 100644
--- a/ares/ares_parse_aaaa_reply.c
+++ b/ares/ares_parse_aaaa_reply.c
@@ -16,7 +16,6 @@
*/
#include "setup.h"
-#include <sys/types.h>
#if defined(WIN32) && !defined(WATT32)
#include "nameser.h"
diff --git a/ares/ares_parse_ns_reply.c b/ares/ares_parse_ns_reply.c
index b8b258abb..19dd88870 100644
--- a/ares/ares_parse_ns_reply.c
+++ b/ares/ares_parse_ns_reply.c
@@ -19,7 +19,6 @@
*/
#include "setup.h"
-#include <sys/types.h>
#if defined(WIN32) && !defined(WATT32)
#include "nameser.h"
diff --git a/ares/ares_parse_ptr_reply.c b/ares/ares_parse_ptr_reply.c
index b8b600b84..8b87c9b87 100644
--- a/ares/ares_parse_ptr_reply.c
+++ b/ares/ares_parse_ptr_reply.c
@@ -16,7 +16,6 @@
*/
#include "setup.h"
-#include <sys/types.h>
#if defined(WIN32) && !defined(WATT32)
#include "nameser.h"
diff --git a/ares/ares_process.c b/ares/ares_process.c
index 6b1b07154..8cb51c3b2 100644
--- a/ares/ares_process.c
+++ b/ares/ares_process.c
@@ -16,7 +16,6 @@
*/
#include "setup.h"
-#include <sys/types.h>
#if defined(WIN32) && !defined(WATT32)
#include "nameser.h"
diff --git a/ares/ares_query.c b/ares/ares_query.c
index 8b2dabd4f..742e87310 100644
--- a/ares/ares_query.c
+++ b/ares/ares_query.c
@@ -16,7 +16,6 @@
*/
#include "setup.h"
-#include <sys/types.h>
#if defined(WIN32) && !defined(WATT32)
#include "nameser.h"
diff --git a/ares/ares_send.c b/ares/ares_send.c
index 6d17a1cd7..7f4362c7c 100644
--- a/ares/ares_send.c
+++ b/ares/ares_send.c
@@ -16,7 +16,6 @@
*/
#include "setup.h"
-#include <sys/types.h>
#if defined(WIN32) && !defined(WATT32)
#include "nameser.h"
diff --git a/ares/ares_timeout.c b/ares/ares_timeout.c
index a6a0af31e..fa5ae0187 100644
--- a/ares/ares_timeout.c
+++ b/ares/ares_timeout.c
@@ -16,7 +16,6 @@
*/
#include "setup.h"
-#include <sys/types.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
diff --git a/ares/bitncmp.c b/ares/bitncmp.c
index bb35d4b46..b9077bacc 100644
--- a/ares/bitncmp.c
+++ b/ares/bitncmp.c
@@ -19,9 +19,7 @@
#ifndef HAVE_BITNCMP
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
+#include "setup.h"
#include "bitncmp.h"
/*
diff --git a/ares/inet_net_pton.c b/ares/inet_net_pton.c
index af941bf6b..487cd825d 100644
--- a/ares/inet_net_pton.c
+++ b/ares/inet_net_pton.c
@@ -19,9 +19,6 @@
#include "setup.h"
-
-#include <sys/types.h>
-
#if defined(WIN32) && !defined(WATT32)
#include "nameser.h"
#else
diff --git a/ares/inet_ntop.c b/ares/inet_ntop.c
index f076e0665..d07e19e3e 100644
--- a/ares/inet_ntop.c
+++ b/ares/inet_ntop.c
@@ -18,8 +18,6 @@
#include "setup.h"
-#include <sys/types.h>
-
#if defined(WIN32) && !defined(WATT32)
#include "nameser.h"
#else