From 62bffb28964ae13d193414f747a25703a2583f77 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 28 Jul 2013 04:44:14 +0200
Subject: [PATCH] Sort #includes and remove unnecessary comments.

---
 src/connection.c |  8 ++------
 src/log.c        |  4 +---
 src/sem.c        |  2 +-
 src/tlsproxy.c   | 14 ++++----------
 src/verify.c     |  3 +--
 tests/client.c   | 16 +++++-----------
 6 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/src/connection.c b/src/connection.c
index 3f361a0..36e0304 100644
--- 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 e00a08d..02cadd2 100644
--- 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 c184453..0df93c6 100644
--- 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 1e8642f..401553f 100644
--- 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 2b49f1d..487ad2e 100644
--- 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 5c230cf..9bf13b5 100644
--- 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>
 
-- 
2.45.2