From: Joel Rosdahl <joel@rosdahl.net>
Date: Fri, 19 Jun 2020 17:46:47 +0000 (+0200)
Subject: Reduce the set of included headers
X-Git-Tag: v4.0~376
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52da8354807ca8a4fdc0dfa9db516302c7892e65;p=thirdparty%2Fccache.git

Reduce the set of included headers
---

diff --git a/src/AtomicFile.cpp b/src/AtomicFile.cpp
index 0cb6cc215..ca9981891 100644
--- a/src/AtomicFile.cpp
+++ b/src/AtomicFile.cpp
@@ -23,10 +23,6 @@
 
 #include "third_party/fmt/core.h"
 
-#include <cassert>
-#include <cerrno>
-#include <unistd.h>
-
 AtomicFile::AtomicFile(const std::string& path, Mode mode) : m_path(path)
 {
   auto fd_and_path = Util::create_temp_fd(path + ".tmp");
diff --git a/src/AtomicFile.hpp b/src/AtomicFile.hpp
index 66d681bca..c38573070 100644
--- a/src/AtomicFile.hpp
+++ b/src/AtomicFile.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Joel Rosdahl and other contributors
+// Copyright (C) 2019-2020 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -20,7 +20,6 @@
 
 #include "system.hpp"
 
-#include <cstdio>
 #include <string>
 #include <vector>
 
diff --git a/src/CacheEntryReader.hpp b/src/CacheEntryReader.hpp
index 1e3784fe6..8ee730232 100644
--- a/src/CacheEntryReader.hpp
+++ b/src/CacheEntryReader.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Joel Rosdahl and other contributors
+// Copyright (C) 2019-2020 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -24,7 +24,6 @@
 #include "Decompressor.hpp"
 #include "Util.hpp"
 
-#include <cstdio>
 #include <memory>
 
 // This class knows how to read a cache entry with a common header and a
diff --git a/src/CacheEntryWriter.hpp b/src/CacheEntryWriter.hpp
index 711035810..14c0d19e6 100644
--- a/src/CacheEntryWriter.hpp
+++ b/src/CacheEntryWriter.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Joel Rosdahl and other contributors
+// Copyright (C) 2019-2020 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -24,7 +24,6 @@
 #include "Compressor.hpp"
 #include "Util.hpp"
 
-#include <cstdio>
 #include <memory>
 
 // This class knows how to write a cache entry with a common header and a
diff --git a/src/CacheFile.hpp b/src/CacheFile.hpp
index 6af0a9ee6..59c180bea 100644
--- a/src/CacheFile.hpp
+++ b/src/CacheFile.hpp
@@ -25,12 +25,7 @@
 
 #include "third_party/nonstd/optional.hpp"
 
-#include <cerrno>
-#include <cstring>
 #include <string>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 class CacheFile
 {
diff --git a/src/File.hpp b/src/File.hpp
index 9f37f3fbe..bfe229ef9 100644
--- a/src/File.hpp
+++ b/src/File.hpp
@@ -22,7 +22,6 @@
 
 #include "NonCopyable.hpp"
 
-#include <cstdio>
 #include <string>
 
 class File : public NonCopyable
diff --git a/src/InodeCache.cpp b/src/InodeCache.cpp
index fd5282bd0..2b1d99299 100644
--- a/src/InodeCache.cpp
+++ b/src/InodeCache.cpp
@@ -30,18 +30,9 @@
 #  include "logging.hpp"
 
 #  include <atomic>
-#  include <errno.h>
-#  include <fcntl.h>
 #  include <libgen.h>
-#  include <stdio.h>
-#  include <stdlib.h>
-#  include <string.h>
 #  include <sys/mman.h>
-#  include <sys/stat.h>
-#  include <sys/types.h>
-#  include <time.h>
 #  include <type_traits>
-#  include <unistd.h>
 
 // The inode cache resides on a file that is mapped into shared memory by
 // running processes. It is implemented as a two level structure, where the top
diff --git a/src/ProgressBar.cpp b/src/ProgressBar.cpp
index 63bf25d09..1e01e0aef 100644
--- a/src/ProgressBar.cpp
+++ b/src/ProgressBar.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Joel Rosdahl and other contributors
+// Copyright (C) 2019-2020 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -20,9 +20,6 @@
 
 #include "third_party/fmt/core.h"
 
-#include <cstdio>
-#include <unistd.h>
-
 #ifndef _WIN32
 #  include <sys/ioctl.h>
 #endif
diff --git a/src/stats.cpp b/src/stats.cpp
index 5fc107e48..6ffb0bc39 100644
--- a/src/stats.cpp
+++ b/src/stats.cpp
@@ -33,13 +33,6 @@
 #include "third_party/fmt/core.h"
 
 #include <cmath>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #define FLAG_NOZERO 1 // don't zero with the -z option
 #define FLAG_ALWAYS 2 // always show, even if zero