Clean up includes (#110)

yedf2 · Aug 19, 2023 · e58eb50 · e58eb50
1 parent c16cde9
commit e58eb50
Show file tree

Hide file tree

Showing 23 changed files with 49 additions and 56 deletions.
diff --git a/handy/conf.cc b/handy/conf.cc
@@ -1,5 +1,5 @@
 #include "conf.h"
-#include <stdlib.h>
+#include <cstdlib>
 #include <algorithm>
 #include <memory>
 

diff --git a/handy/daemon.cc b/handy/daemon.cc
@@ -1,14 +1,11 @@
 #include "daemon.h"
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <strings.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <time.h>
 #include <unistd.h>
 #include <functional>
 #include <map>

diff --git a/handy/daemon.h b/handy/daemon.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <signal.h>
+#include <csignal>
 #include <functional>
 namespace handy {
 

diff --git a/handy/event_base.cc b/handy/event_base.cc
@@ -1,6 +1,6 @@
 #include "event_base.h"
 #include <fcntl.h>
-#include <string.h>
+#include <cstring>
 #include <map>
 #include "conn.h"
 #include "logging.h"

diff --git a/handy/file.cc b/handy/file.cc
@@ -2,7 +2,6 @@
 #include <dirent.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 using namespace std;
 

diff --git a/handy/logging.cc b/handy/logging.cc
@@ -1,18 +1,15 @@
 #include "logging.h"
-#include <assert.h>
-#include <errno.h>
+#include <cassert>
+#include <cerrno>
 #include <fcntl.h>
-#include <stdarg.h>
-#include <string.h>
+#include <cstdarg>
+#include <cstring>
 #include <sys/stat.h>
-#include <sys/syscall.h>
-#include <sys/time.h>
-#include <sys/types.h>
+#include <ctime>
 #include <syslog.h>
-#include <time.h>
 #include <unistd.h>
-#include <utility>
 #include <thread>
+#include <sys/time.h>
 #include "port_posix.h"
 
 using namespace std;

diff --git a/handy/logging.h b/handy/logging.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <stdio.h>
+#include <cstdio>
 #include <atomic>
 #include <string>
 #include "util.h"

diff --git a/handy/net.cc b/handy/net.cc
@@ -1,5 +1,5 @@
 #include "net.h"
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <netinet/tcp.h>
 #include <sys/socket.h>

diff --git a/handy/net.h b/handy/net.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <netinet/in.h>
-#include <string.h>
+#include <cstring>
 #include <algorithm>
 #include <string>
 #include "port_posix.h"

diff --git a/handy/poller.cc b/handy/poller.cc
@@ -1,5 +1,4 @@
 #include <fcntl.h>
-#include "conn.h"
 #include "event_base.h"
 #include "logging.h"
 #include "util.h"

diff --git a/handy/poller.h b/handy/poller.h
@@ -1,7 +1,7 @@
 #pragma once
-#include <assert.h>
+#include <cassert>
 #include <poll.h>
-#include <string.h>
+#include <cstring>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <atomic>

diff --git a/handy/port_posix.cc b/handy/port_posix.cc
@@ -1,7 +1,6 @@
 #include "port_posix.h"
 #include <netdb.h>
-#include <pthread.h>
-#include <string.h>
+#include <cstring>
 #include <sys/syscall.h>
 #include <unistd.h>
 

diff --git a/handy/slice.h b/handy/slice.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <string.h>
+#include <cstring>
 #include <string>
 #include <vector>
 

diff --git a/handy/status.h b/handy/status.h
@@ -1,7 +1,8 @@
 #pragma once
-#include <errno.h>
-#include <stdarg.h>
-#include <string.h>
+#include <cerrno>
+#include <cstdarg>
+#include <cstring>
+#include <cstdint>
 #include "util.h"
 
 namespace handy {

diff --git a/handy/threads.cc b/handy/threads.cc
@@ -1,6 +1,7 @@
 #include "threads.h"
-#include <assert.h>
+#include <cassert>
 #include <utility>
+
 using namespace std;
 
 namespace handy {

diff --git a/handy/util.cc b/handy/util.cc
@@ -1,6 +1,6 @@
 #include "util.h"
 #include <fcntl.h>
-#include <stdarg.h>
+#include <cstdarg>
 #include <algorithm>
 #include <chrono>
 #include <memory>

diff --git a/handy/util.h b/handy/util.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <functional>
 #include <string>
 #include <utility>

diff --git a/raw-examples/epoll-et.cc b/raw-examples/epoll-et.cc
@@ -5,13 +5,13 @@
  * 客户端发送GET请求后，服务器返回1M的数据，会触发EPOLLOUT，从epoll-et输出的日志看，EPOLLOUT事件得到了正确的处理
  */
 #include <arpa/inet.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <sys/epoll.h>
 #include <sys/socket.h>
 #include <unistd.h>

diff --git a/raw-examples/epoll.cc b/raw-examples/epoll.cc
@@ -4,13 +4,13 @@
  * 测试：curl -v localhost
  */
 #include <arpa/inet.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <sys/epoll.h>
 #include <sys/socket.h>
 #include <unistd.h>

diff --git a/raw-examples/kqueue.cc b/raw-examples/kqueue.cc
@@ -6,12 +6,12 @@
  * 例子的echo返回了 abc
  */
 #include <arpa/inet.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <sys/event.h>
 #include <sys/socket.h>
 #include <unistd.h>

diff --git a/test/conf.ut.cc b/test/conf.ut.cc
@@ -1,5 +1,5 @@
 #include <handy/conf.h>
-#include <string.h>
+#include <cstring>
 #include "test_harness.h"
 
 using namespace std;

diff --git a/test/test_harness.cc b/test/test_harness.cc
@@ -1,7 +1,7 @@
 #include "test_harness.h"
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <string>

diff --git a/test/test_harness.h b/test/test_harness.h
@@ -1,5 +1,5 @@
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <sstream>
 
 namespace handy {