New run of include-what-you-use.

diff --git a/acceptor.cpp b/acceptor.cpp
index 70cd30c23bdfdcd53c16efe025c2ce4e58b01bdd..3172c73b80a1821e0973e08c267f6f8ccae74c10 100644 (file)
--- a/acceptor.cpp
+++ b/acceptor.cpp
@@ -2,7 +2,6 @@
 #include <errno.h>
 #include <netinet/in.h>
 #include <poll.h>
 #include <errno.h>
 #include <netinet/in.h>
 #include <poll.h>

-#include <stdio.h>

 #include <stdlib.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/ioctl.h>

diff --git a/accesslog.cpp b/accesslog.cpp
index 7dfadff5bbd5923a0ef74ac1566b32c506a80f3c..f8ee50bd42d39589fbe812624310fa52c8ec80e4 100644 (file)
--- a/accesslog.cpp
+++ b/accesslog.cpp
@@ -1,9 +1,9 @@
+#include <errno.h>
+#include <poll.h>
+#include <stddef.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <time.h>

 #include <unistd.h>
 #include <unistd.h>

-#include <sys/poll.h>
-#include <errno.h>
-
-#include <algorithm>

 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

diff --git a/accesslog.h b/accesslog.h
index 66be5a861543244824664a9778a70494bb0e84d9..0ef5c753ef4c433c9ba1411d5195ce15f87085aa 100644 (file)
--- a/accesslog.h
+++ b/accesslog.h
@@ -5,8 +5,8 @@
 // Server instances, we try not to let write() block too much, and rather do
 // all the I/O in a separate I/O thread.
 
 // Server instances, we try not to let write() block too much, and rather do
 // all the I/O in a separate I/O thread.
 

+#include <pthread.h>

 #include <stdio.h>
 #include <stdio.h>

-

 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

diff --git a/client.cpp b/client.cpp
index 0c38a4414eddc6fa0e576abab01d90bfd7c832e6..04518c8c2f58a97e9afcd877b77c91863d319bcc 100644 (file)
--- a/client.cpp
+++ b/client.cpp
@@ -1,6 +1,6 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>

-#include <stdio.h>
+#include <stdint.h>

 #include <sys/socket.h>
 
 #include "client.h"
 #include <sys/socket.h>
 
 #include "client.h"

diff --git a/httpinput.cpp b/httpinput.cpp
index da672edc3689a14cb4707f29f060d9db73183bad..49501831fa7df2805eead2a172b5dab5d77a3320 100644 (file)
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -4,7 +4,6 @@
 #include <netinet/in.h>
 #include <poll.h>
 #include <stdint.h>
 #include <netinet/in.h>
 #include <poll.h>
 #include <stdint.h>

-#include <stdio.h>

 #include <stdlib.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/ioctl.h>

diff --git a/log.cpp b/log.cpp
index 0b3db4fdf2c0d7c363e204951a9539a73e0fec9b..753fbd4f6f3239364a84a4a103453036817071b8 100644 (file)
--- a/log.cpp
+++ b/log.cpp
@@ -1,14 +1,15 @@
-#include "log.h"
-
+#include <assert.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stddef.h>

 #include <stdio.h>
 #include <string.h>
 #include <stdio.h>
 #include <string.h>

-#include <stdarg.h>

 #include <syslog.h>
 #include <syslog.h>

-#include <assert.h>
-#include <errno.h>

 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

+#include "log.h"
+

 using namespace std;
 
 // Yes, it's a bit ugly.
 using namespace std;
 
 // Yes, it's a bit ugly.

diff --git a/main.cpp b/main.cpp
index c42fd19cf200fcd60e16e1890d58b8dbf303a3dd..46eddaf834ce7aacfa3c3e518d70618747731246 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -16,8 +16,8 @@
 #include <utility>
 #include <vector>
 
 #include <utility>
 #include <vector>
 

-#include "accesslog.h"

 #include "acceptor.h"
 #include "acceptor.h"

+#include "accesslog.h"

 #include "config.h"
 #include "input.h"
 #include "log.h"
 #include "config.h"
 #include "input.h"
 #include "log.h"


@@ -25,6 +25,7 @@
 #include "serverpool.h"
 #include "state.pb.h"
 #include "stats.h"
 #include "serverpool.h"
 #include "state.pb.h"
 #include "stats.h"

+#include "stream.h"

 #include "util.h"
 #include "version.h"
 
 #include "util.h"
 #include "version.h"
 

diff --git a/server.cpp b/server.cpp
index 74a20c83d2308c5a0664b2e15ad040970ab47257..a000d9c6d08f0f3d799c07f3bfec1902f68fc141 100644 (file)
--- a/server.cpp
+++ b/server.cpp
@@ -1,9 +1,11 @@
-#include <arpa/inet.h>

 #include <assert.h>
 #include <errno.h>
 #include <assert.h>
 #include <errno.h>

+#include <netinet/in.h>

 #include <pthread.h>
 #include <pthread.h>

+#include <stdint.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdlib.h>

+#include <string.h>

 #include <sys/epoll.h>
 #include <sys/sendfile.h>
 #include <sys/socket.h>
 #include <sys/epoll.h>
 #include <sys/sendfile.h>
 #include <sys/socket.h>

diff --git a/serverpool.cpp b/serverpool.cpp
index 68281996847fa5686158d50e33b588f198d330d6..fb1668239a366b004313db3ab4b0efb2fd63ec00 100644 (file)
--- a/serverpool.cpp
+++ b/serverpool.cpp
@@ -1,5 +1,8 @@
-#include <unistd.h>
+#include <assert.h>

 #include <errno.h>
 #include <errno.h>

+#include <google/protobuf/repeated_field.h>
+#include <stdlib.h>
+#include <unistd.h>

 
 #include "client.h"
 #include "log.h"
 
 #include "client.h"
 #include "log.h"

diff --git a/serverpool.h b/serverpool.h
index a02798135b12eabe56b9516193831979ab40fec7..6a2fcb53deef177fedd13ba7be99448a48198f48 100644 (file)
--- a/serverpool.h
+++ b/serverpool.h
@@ -7,6 +7,7 @@
 
 #include "server.h"
 #include "state.pb.h"
 
 #include "server.h"
 #include "state.pb.h"

+#include "stream.h"

 
 class MarkPool;
 class Server;
 
 class MarkPool;
 class Server;

diff --git a/stats.cpp b/stats.cpp
index 24bc23f6cbda30c567214b6e5fe29441793b50bd..8e4443cf14d4f2ce478c702a1bbb0127fa8f461b 100644 (file)
--- a/stats.cpp
+++ b/stats.cpp
@@ -1,12 +1,12 @@
+#include <errno.h>

 #include <fcntl.h>
 #include <fcntl.h>

+#include <poll.h>

 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>

-#include <sys/poll.h>
-#include <errno.h>

 #include <vector>
 
 #include "client.h"
 #include <vector>
 
 #include "client.h"

diff --git a/stream.cpp b/stream.cpp
index 109d2fd4a90116398e8b638816872cabf06b22ce..3e0d78dd771159b3d4f7d1bd5df1e2ee728127b1 100644 (file)
--- a/stream.cpp
+++ b/stream.cpp
@@ -1,14 +1,15 @@
-#include <arpa/inet.h>
+#include <assert.h>

 #include <errno.h>
 #include <errno.h>

-#include <stdio.h>
+#include <netinet/in.h>

 #include <stdlib.h>
 #include <stdlib.h>

+#include <string.h>

 #include <unistd.h>
 #include <string>
 #include <vector>
 
 #include <unistd.h>
 #include <string>
 #include <vector>
 

-#include "state.pb.h"

 #include "log.h"
 #include "metacube.h"
 #include "log.h"
 #include "metacube.h"

+#include "state.pb.h"

 #include "stream.h"
 #include "util.h"
 
 #include "stream.h"
 #include "util.h"