From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sat, 13 Apr 2013 20:13:56 +0000 (+0200)
Subject: Run include-what-you-use.
X-Git-Tag: 1.0.0~122
X-Git-Url: https://git.sesse.net/?p=cubemap;a=commitdiff_plain;h=488f28bf7070f44469a006ed4a9d4c423788d175;ds=inline

Run include-what-you-use.
---

diff --git a/acceptor.cpp b/acceptor.cpp
index 6f7ffa2..ecebf7e 100644
--- a/acceptor.cpp
+++ b/acceptor.cpp
@@ -1,13 +1,13 @@
+#include <assert.h>
+#include <errno.h>
+#include <netinet/in.h>
+#include <poll.h>
 #include <stdio.h>
-#include <unistd.h>
-#include <string.h>
 #include <stdlib.h>
-#include <signal.h>
-#include <errno.h>
-#include <arpa/inet.h>
+#include <string.h>
 #include <sys/ioctl.h>
-#include <sys/poll.h>
 #include <sys/socket.h>
+#include <unistd.h>
 
 #include "acceptor.h"
 #include "serverpool.h"
diff --git a/client.cpp b/client.cpp
index be47e0e..c74209d 100644
--- a/client.cpp
+++ b/client.cpp
@@ -1,13 +1,12 @@
+#include <arpa/inet.h>
+#include <netinet/in.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <sys/socket.h>
-#include <arpa/inet.h>
-#include <errno.h>
 
 #include "client.h"
 #include "markpool.h"
-#include "stream.h"
 #include "state.pb.h"
+#include "stream.h"
 
 using namespace std;
 
diff --git a/client.h b/client.h
index ff07a7b..e82b487 100644
--- a/client.h
+++ b/client.h
@@ -3,6 +3,7 @@
 
 // A Client represents a single connection from a client (watching a single stream).
 
+#include <stddef.h>
 #include <time.h>
 #include <string>
 
diff --git a/config.cpp b/config.cpp
index 32e0e65..bcd86a9 100644
--- a/config.cpp
+++ b/config.cpp
@@ -1,12 +1,12 @@
+#include <assert.h>
+#include <ctype.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
-#include <limits.h>
-#include <ctype.h>
-#include <assert.h>
+#include <string.h>
 #include <map>
-#include <vector>
 #include <string>
+#include <utility>
+#include <vector>
 
 #include "config.h"
 #include "parse.h"
diff --git a/config.h b/config.h
index e7385e2..34edaa7 100644
--- a/config.h
+++ b/config.h
@@ -3,8 +3,9 @@
 
 // Various routines that deal with parsing the configuration file.
 
-#include <vector>
+#include <stddef.h>
 #include <string>
+#include <vector>
 
 struct MarkPoolConfig {
 	int from, to;
diff --git a/httpinput.cpp b/httpinput.cpp
index 291b17f..875ee62 100644
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -1,31 +1,26 @@
+#include <assert.h>
+#include <errno.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <poll.h>
+#include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
-#include <unistd.h>
-#include <assert.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <pthread.h>
-#include <sys/types.h>
 #include <sys/ioctl.h>
-#include <sys/types.h>
 #include <sys/socket.h>
-#include <netdb.h>
-#include <poll.h>
-#include <signal.h>
-#include <errno.h>
-#include <vector>
-#include <string>
+#include <unistd.h>
 #include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
-#include "metacube.h"
-#include "mutexlock.h"
 #include "httpinput.h"
-#include "server.h"
-#include "serverpool.h"
+#include "metacube.h"
 #include "parse.h"
-#include "version.h"
+#include "serverpool.h"
 #include "state.pb.h"
+#include "version.h"
 
 using namespace std;
 
diff --git a/httpinput.h b/httpinput.h
index 1714b71..f14b099 100644
--- a/httpinput.h
+++ b/httpinput.h
@@ -1,8 +1,9 @@
 #ifndef _HTTPINPUT_H
 #define _HTTPINPUT_H 1
 
-#include <vector>
+#include <stddef.h>
 #include <string>
+#include <vector>
 
 #include "input.h"
 
diff --git a/input.cpp b/input.cpp
index 3f6a9d7..d7c2b77 100644
--- a/input.cpp
+++ b/input.cpp
@@ -1,10 +1,11 @@
+#include <stddef.h>
 #include <string.h>
 #include <string>
 
 #include "httpinput.h"
-#include "udpinput.h"
 #include "input.h"
 #include "state.pb.h"
+#include "udpinput.h"
 
 using namespace std;
 
diff --git a/main.cpp b/main.cpp
index 1369c9f..8ac7802 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,39 +1,30 @@
-#include <stdio.h>
-#include <string.h>
-#include <stdint.h>
-#include <unistd.h>
 #include <assert.h>
+#include <errno.h>
 #include <getopt.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <pthread.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/poll.h>
+#include <google/protobuf/stubs/common.h>
+#include <signal.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/time.h>
-#include <sys/types.h>
 #include <sys/wait.h>
-#include <signal.h>
-#include <errno.h>
-#include <ctype.h>
-#include <fcntl.h>
-#include <vector>
-#include <string>
+#include <unistd.h>
 #include <map>
 #include <set>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "acceptor.h"
 #include "config.h"
+#include "input.h"
 #include "markpool.h"
-#include "metacube.h"
-#include "parse.h"
-#include "server.h"
 #include "serverpool.h"
-#include "input.h"
+#include "state.pb.h"
 #include "stats.h"
 #include "util.h"
 #include "version.h"
-#include "state.pb.h"
 
 using namespace std;
 
diff --git a/parse.cpp b/parse.cpp
index eed7d19..f77af4a 100644
--- a/parse.cpp
+++ b/parse.cpp
@@ -1,10 +1,8 @@
+#include <ctype.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <assert.h>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "parse.h"
 
diff --git a/parse.h b/parse.h
index 6912dd9..de26064 100644
--- a/parse.h
+++ b/parse.h
@@ -3,8 +3,9 @@
 
 // Various routines that deal with parsing; both HTTP requests and more generic text.
 
-#include <vector>
+#include <stddef.h>
 #include <string>
+#include <vector>
 
 // Split a line on whitespace, e.g. "foo  bar baz" -> {"foo", "bar", "baz"}.
 std::vector<std::string> split_tokens(const std::string &line);
diff --git a/server.cpp b/server.cpp
index 64819f4..dfd5b97 100644
--- a/server.cpp
+++ b/server.cpp
@@ -1,29 +1,26 @@
-#include <stdio.h>
-#include <string.h>
-#include <stdint.h>
-#include <unistd.h>
 #include <assert.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
+#include <errno.h>
 #include <pthread.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <sys/epoll.h>
 #include <sys/sendfile.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 #include <time.h>
-#include <signal.h>
-#include <errno.h>
-#include <vector>
-#include <string>
-#include <map>
+#include <unistd.h>
 #include <algorithm>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "markpool.h"
+#include "mutexlock.h"
 #include "parse.h"
 #include "server.h"
-#include "stream.h"
-#include "mutexlock.h"
 #include "state.pb.h"
+#include "stream.h"
 
 using namespace std;
 
diff --git a/server.h b/server.h
index 343adf9..e8114cf 100644
--- a/server.h
+++ b/server.h
@@ -1,17 +1,22 @@
 #ifndef _SERVER_H
 #define _SERVER_H 1
 
-#include <stdint.h>
 #include <pthread.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <sys/epoll.h>
+#include <sys/types.h>
 #include <time.h>
-#include <string>
 #include <map>
+#include <string>
 #include <vector>
 
 #include "client.h"
 #include "thread.h"
 
+class ClientProto;
+struct Stream;
+
 #define EPOLL_MAX_EVENTS 8192
 #define EPOLL_TIMEOUT_MS 20
 #define MAX_CLIENT_REQUEST 16384
diff --git a/serverpool.cpp b/serverpool.cpp
index e47c8d5..ee3587f 100644
--- a/serverpool.cpp
+++ b/serverpool.cpp
@@ -1,3 +1,7 @@
+#include <google/protobuf/repeated_field.h>
+
+#include "client.h"
+#include "server.h"
 #include "serverpool.h"
 #include "state.pb.h"
 
diff --git a/serverpool.h b/serverpool.h
index 1369db0..106877a 100644
--- a/serverpool.h
+++ b/serverpool.h
@@ -1,11 +1,16 @@
 #ifndef _SERVERPOOL_H
 #define _SERVERPOOL_H 1
 
-#include "server.h"
-
+#include <stddef.h>
+#include <string>
 #include <vector>
 
+#include "server.h"
+#include "state.pb.h"
+
 class MarkPool;
+class Server;
+struct ClientStats;
 
 // Provides services such as load-balancing between a number of Server instances.
 class ServerPool {
diff --git a/stats.cpp b/stats.cpp
index 94cd4e7..49106ee 100644
--- a/stats.cpp
+++ b/stats.cpp
@@ -1,11 +1,13 @@
+#include <fcntl.h>
+#include <stddef.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
+#include <time.h>
 #include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <pthread.h>
+#include <vector>
 
+#include "client.h"
 #include "serverpool.h"
 #include "stats.h"
 
diff --git a/stream.cpp b/stream.cpp
index 322391e..080d3bf 100644
--- a/stream.cpp
+++ b/stream.cpp
@@ -1,13 +1,13 @@
+#include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
-#include <errno.h>
-#include <algorithm>
 #include <string>
 #include <vector>
 
+#include "state.pb.h"
 #include "stream.h"
 #include "util.h"
-#include "state.pb.h"
 
 using namespace std;
 
diff --git a/stream.h b/stream.h
index efedc9b..ea13f40 100644
--- a/stream.h
+++ b/stream.h
@@ -4,13 +4,14 @@
 // Representation of a single, muxed (we only really care about bytes/blocks) stream.
 // Fed by Input, sent out by Server (to Client).
 
+#include <stddef.h>
 #include <stdint.h>
 #include <string>
 #include <vector>
 
-struct Client;
 class MarkPool;
 class StreamProto;
+struct Client;
 
 struct Stream {
 	Stream(const std::string &stream_id, size_t backlog_size);
diff --git a/udpinput.cpp b/udpinput.cpp
index 6537035..fc0779c 100644
--- a/udpinput.cpp
+++ b/udpinput.cpp
@@ -1,17 +1,17 @@
+#include <assert.h>
+#include <errno.h>
+#include <poll.h>
 #include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
+#include <stdlib.h>
 #include <sys/socket.h>
-#include <sys/poll.h>
-#include <arpa/inet.h>
-#include <errno.h>
+#include <unistd.h>
 #include <string>
 
 #include "acceptor.h"
-#include "udpinput.h"
 #include "serverpool.h"
-#include "version.h"
 #include "state.pb.h"
+#include "udpinput.h"
+#include "version.h"
 
 using namespace std;
 
diff --git a/udpinput.h b/udpinput.h
index 0f89d68..a5f71b9 100644
--- a/udpinput.h
+++ b/udpinput.h
@@ -1,8 +1,8 @@
 #ifndef _UDPINPUT_H
 #define _UDPINPUT_H 1
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "input.h"
 
diff --git a/util.cpp b/util.cpp
index c8e26d2..a5d6378 100644
--- a/util.cpp
+++ b/util.cpp
@@ -1,7 +1,8 @@
+#include <errno.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <errno.h>
 
 #include "util.h"