Sort #includes and remove unnecessary comments.

diff --git a/src/connection.c b/src/connection.c
index 3f361a03effdd8cbd54a5bbe17d068b98f714ac2..36e03048943f9d6bc00f6f3f342f74f845a54e32 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -21,14 +21,10 @@
 #include "connection.h"
 #include "verify.h"
 
-/* close() */
-#include <unistd.h>
-/* getaddrinfo() */
+#include <errno.h>
 #include <netdb.h>
-/* poll() */
 #include <poll.h>
-/* errno */
-#include <errno.h>
+#include <unistd.h>
 
 
 /* Maximum length of a HTTP request line. Longer request lines are aborted

diff --git a/src/log.c b/src/log.c
index e00a08d8aa77f9a2914ce39fee3821c97bd87e97..02cadd200d7bc6dd8f5460f19435d11af16c4d67 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -20,10 +20,8 @@
 #include "tlsproxy.h"
 #include "log.h"
 
-/* va_*() */
-#include <stdarg.h>
-/* pthread_self() */
 #include <pthread.h>
+#include <stdarg.h>
 
 
 void log_message(int level, const char *file, int line, const char *format, ...) {

diff --git a/src/sem.c b/src/sem.c
index c18445361fb1fcccd6233a2c98460232d84457ae..0df93c62078ec73295c031d140eb824b4430acbc 100644 (file)
--- a/src/sem.c
+++ b/src/sem.c
@@ -19,8 +19,8 @@
 
 #include "sem.h"
 
-#include <stdlib.h>
 #include <pthread.h>
+#include <stdlib.h>
 
 
 struct SEM {

diff --git a/src/tlsproxy.c b/src/tlsproxy.c
index 1e8642fa4ca4e40d93879e058bffb974bc402a8e..401553f52e4d922846c4c9da664f9cf3bd67c416 100644 (file)
--- a/src/tlsproxy.c
+++ b/src/tlsproxy.c
@@ -23,19 +23,13 @@
 #include "sem.h"
 #include "connection.h"
 
-/* socket(), bind(), accept(), listen() */
-#include <sys/types.h>
-#include <sys/socket.h>
-/* close() */
-#include <unistd.h>
-/* htons() */
 #include <arpa/inet.h>
-/* sigaction() */
-#include <signal.h>
-/* errno */
 #include <errno.h>
-/* pthread_*() */
 #include <pthread.h>
+#include <signal.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 /* For GnuTLS. */
 #include <gcrypt.h>

diff --git a/src/verify.c b/src/verify.c
index 2b49f1d2dac5fb80036dce312d82dedb24a3b2aa..487ad2ede213e1fc266d4e890fc5ce5ee50f1980 100644 (file)
--- a/src/verify.c
+++ b/src/verify.c
@@ -20,9 +20,8 @@
 #include "tlsproxy.h"
 #include "verify.h"
 
-/* errno */
 #include <errno.h>
-/* gnutls_x509_*() */
+
 #include <gnutls/x509.h>
 
 

diff --git a/tests/client.c b/tests/client.c
index 5c230cf666dbad2564542ed4b08347ebdcf1101f..9bf13b5b900bd261b3dfa7f61021b8c95a9a0311 100644 (file)
--- a/tests/client.c
+++ b/tests/client.c
@@ -19,22 +19,16 @@
 
 #include <config.h>
 
-#include <stdlib.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include <netdb.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-/* socket(), connect() */
-#include <sys/types.h>
 #include <sys/socket.h>
-/* close() */
+#include <sys/types.h>
 #include <unistd.h>
-/* getaddrinfo() */
-#include <netdb.h>
-/* htons() */
-#include <arpa/inet.h>
-/* errno */
-#include <errno.h>
 
-/* GnuTLS */
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>