Enable more clang-tidy checks and treat them as errors
Test: tests/runtests.sh
Change-Id: If59480cee6460847f5c1cef17e3ef036b8e75651
diff --git a/server/BandwidthControllerTest.cpp b/server/BandwidthControllerTest.cpp
index febbe62..9337ac5 100644
--- a/server/BandwidthControllerTest.cpp
+++ b/server/BandwidthControllerTest.cpp
@@ -38,18 +38,17 @@
#include "netdbpf/bpf_shared.h"
#include "tun_interface.h"
+using ::testing::_;
using ::testing::ByMove;
using ::testing::Invoke;
using ::testing::Return;
using ::testing::StrictMock;
-using ::testing::Test;
-using ::testing::_;
using android::base::Join;
using android::base::StringPrintf;
using android::net::TunInterface;
-using android::netdutils::status::ok;
using android::netdutils::UniqueFile;
+using android::netdutils::status::ok;
const std::string ACCOUNT_RULES_WITHOUT_BPF =
"*filter\n"
diff --git a/server/Controllers.cpp b/server/Controllers.cpp
index 4281eb0..8f0dad2 100644
--- a/server/Controllers.cpp
+++ b/server/Controllers.cpp
@@ -35,7 +35,6 @@
namespace android {
namespace net {
-using android::base::Join;
using android::base::StringPrintf;
using android::base::StringAppendF;
diff --git a/server/FirewallControllerTest.cpp b/server/FirewallControllerTest.cpp
index 836adb8..71cc532 100644
--- a/server/FirewallControllerTest.cpp
+++ b/server/FirewallControllerTest.cpp
@@ -30,7 +30,6 @@
#include "IptablesBaseTest.h"
using android::base::Join;
-using android::base::StringPrintf;
using android::base::WriteStringToFile;
namespace android {
@@ -86,8 +85,8 @@
"COMMIT\n"
};
std::vector<std::pair<IptablesTarget, std::string>> expectedRestoreCommands = {
- { V4, android::base::Join(expectedRestore4, '\n') },
- { V6, android::base::Join(expectedRestore6, '\n') },
+ {V4, Join(expectedRestore4, '\n')},
+ {V6, Join(expectedRestore6, '\n')},
};
createChain("fw_whitelist", WHITELIST);
@@ -104,8 +103,8 @@
"COMMIT\n"
};
std::vector<std::pair<IptablesTarget, std::string>> expectedRestoreCommands = {
- { V4, android::base::Join(expectedRestore, '\n') },
- { V6, android::base::Join(expectedRestore, '\n') },
+ {V4, Join(expectedRestore, '\n')},
+ {V6, Join(expectedRestore, '\n')},
};
createChain("fw_blacklist", BLACKLIST);
@@ -348,4 +347,4 @@
}
} // namespace net
-} // namespace android
\ No newline at end of file
+} // namespace android
diff --git a/server/IptablesRestoreController.cpp b/server/IptablesRestoreController.cpp
index eb67b75..8339177 100644
--- a/server/IptablesRestoreController.cpp
+++ b/server/IptablesRestoreController.cpp
@@ -104,8 +104,8 @@
processTerminated = true;
}
- const pid_t pid;
- const int stdIn;
+ const pid_t pid; // NOLINT(misc-non-private-member-variables-in-classes)
+ const int stdIn; // NOLINT(misc-non-private-member-variables-in-classes)
struct pollfd pollFds[2];
std::string errBuf;
diff --git a/server/NFLogListener.cpp b/server/NFLogListener.cpp
index e1615ff..76972b6 100644
--- a/server/NFLogListener.cpp
+++ b/server/NFLogListener.cpp
@@ -32,16 +32,14 @@
namespace android {
namespace net {
+using netdutils::extract;
+using netdutils::findWithDefault;
+using netdutils::makeSlice;
using netdutils::Slice;
+using netdutils::sSyscalls;
using netdutils::Status;
using netdutils::StatusOr;
-using netdutils::UniqueFd;
-using netdutils::Status;
-using netdutils::makeSlice;
-using netdutils::sSyscalls;
-using netdutils::findWithDefault;
using netdutils::status::ok;
-using netdutils::extract;
constexpr int kNFLogConfigMsgType = (NFNL_SUBSYS_ULOG << 8) | NFULNL_MSG_CONFIG;
constexpr int kNFLogPacketMsgType = (NFNL_SUBSYS_ULOG << 8) | NFULNL_MSG_PACKET;
diff --git a/server/NFLogListenerTest.cpp b/server/NFLogListenerTest.cpp
index b9f9e55..f3bd810 100644
--- a/server/NFLogListenerTest.cpp
+++ b/server/NFLogListenerTest.cpp
@@ -27,24 +27,19 @@
#include <netdutils/MockSyscalls.h>
#include "NFLogListener.h"
-using ::testing::ByMove;
+using ::testing::_;
+using ::testing::DoAll;
using ::testing::Exactly;
using ::testing::Invoke;
-using ::testing::Mock;
-using ::testing::SaveArg;
-using ::testing::DoAll;
using ::testing::Return;
+using ::testing::SaveArg;
using ::testing::StrictMock;
-using ::testing::_;
namespace android {
namespace net {
-using netdutils::Fd;
using netdutils::Slice;
using netdutils::StatusOr;
-using netdutils::UniqueFd;
-using netdutils::forEachNetlinkAttribute;
using netdutils::makeSlice;
using netdutils::status::ok;
@@ -55,7 +50,7 @@
public:
~MockNetlinkListener() override = default;
- MOCK_METHOD1(send, netdutils::Status(const netdutils::Slice msg));
+ MOCK_METHOD1(send, netdutils::Status(const Slice msg));
MOCK_METHOD2(subscribe, netdutils::Status(uint16_t type, const DispatchFn& fn));
MOCK_METHOD1(unsubscribe, netdutils::Status(uint16_t type));
MOCK_METHOD0(join, void());
@@ -106,13 +101,13 @@
TEST_F(NFLogListenerTest, subscribe) {
constexpr uint16_t kType = 38;
- const auto dispatchFn = [](const nlmsghdr&, const nfgenmsg&, const netdutils::Slice) {};
+ const auto dispatchFn = [](const nlmsghdr&, const nfgenmsg&, const Slice) {};
subscribe(kType, dispatchFn);
}
TEST_F(NFLogListenerTest, nlmsgDone) {
constexpr uint16_t kType = 38;
- const auto dispatchFn = [](const nlmsghdr&, const nfgenmsg&, const netdutils::Slice) {};
+ const auto dispatchFn = [](const nlmsghdr&, const nfgenmsg&, const Slice) {};
subscribe(kType, dispatchFn);
mDoneFn({}, {});
}
@@ -121,7 +116,7 @@
int invocations = 0;
constexpr uint16_t kType = 38;
const auto dispatchFn = [&invocations, kType](const nlmsghdr&, const nfgenmsg& nfmsg,
- const netdutils::Slice) {
+ const Slice) {
EXPECT_EQ(kType, ntohs(nfmsg.res_id));
++invocations;
};
@@ -133,7 +128,7 @@
TEST_F(NFLogListenerTest, dispatchUnknownType) {
constexpr uint16_t kType = 38;
constexpr uint16_t kBadType = kType + 1;
- const auto dispatchFn = [](const nlmsghdr&, const nfgenmsg&, const netdutils::Slice) {
+ const auto dispatchFn = [](const nlmsghdr&, const nfgenmsg&, const Slice) {
// Expect no invocations
ASSERT_TRUE(false);
};
diff --git a/server/NetdHwService.cpp b/server/NetdHwService.cpp
index d76075e..b209aca 100644
--- a/server/NetdHwService.cpp
+++ b/server/NetdHwService.cpp
@@ -16,7 +16,6 @@
#include <binder/IPCThreadState.h>
#include <hidl/HidlTransportSupport.h>
-#include <hwbinder/IPCThreadState.h>
#include "Controllers.h"
#include "Fwmark.h"
#include "NetdHwService.h"
@@ -24,7 +23,6 @@
#include "TetherController.h"
using android::hardware::configureRpcThreadpool;
-using android::hardware::IPCThreadState;
using android::hardware::Void;
// Tells TetherController::enableForwarding who is requesting forwarding, so that TetherController
diff --git a/server/TetherController.cpp b/server/TetherController.cpp
index 20e7cee..75cda7d 100644
--- a/server/TetherController.cpp
+++ b/server/TetherController.cpp
@@ -54,7 +54,6 @@
namespace net {
using android::base::Join;
-using android::base::StringAppendF;
using android::base::StringPrintf;
using android::netdutils::statusFromErrno;
using android::netdutils::StatusOr;
diff --git a/server/TrafficController.cpp b/server/TrafficController.cpp
index d599a82..b55e667 100644
--- a/server/TrafficController.cpp
+++ b/server/TrafficController.cpp
@@ -59,7 +59,6 @@
using base::StringPrintf;
using base::unique_fd;
-using base::Join;
using netdutils::extract;
using netdutils::Slice;
using netdutils::sSyscalls;
@@ -721,6 +720,7 @@
return StringPrintf("OK");
}
+// NOLINTNEXTLINE(google-runtime-references): grandfathered pass by non-const reference
void dumpBpfMap(const std::string& mapName, DumpWriter& dw, const std::string& header) {
dw.blankline();
dw.println("%s:", mapName.c_str());
diff --git a/server/TrafficControllerTest.cpp b/server/TrafficControllerTest.cpp
index 541738b..31d3b6b 100644
--- a/server/TrafficControllerTest.cpp
+++ b/server/TrafficControllerTest.cpp
@@ -33,7 +33,6 @@
#include <android-base/strings.h>
#include <netdutils/MockSyscalls.h>
-#include "netdutils/Status.h"
#include "netdutils/StatusOr.h"
#include "FirewallController.h"
@@ -42,20 +41,10 @@
using namespace android::bpf; // NOLINT(google-build-using-namespace): grandfathered
-using ::testing::_;
-using ::testing::ByMove;
-using ::testing::Invoke;
-using ::testing::Return;
-using ::testing::StrictMock;
-using ::testing::Test;
-
namespace android {
namespace net {
-using base::unique_fd;
using netdutils::isOk;
-using netdutils::Status;
-using netdutils::status::ok;
using netdutils::StatusOr;
constexpr int TEST_MAP_SIZE = 10;
diff --git a/server/XfrmControllerTest.cpp b/server/XfrmControllerTest.cpp
index 1613905..8f09ca8 100644
--- a/server/XfrmControllerTest.cpp
+++ b/server/XfrmControllerTest.cpp
@@ -60,8 +60,6 @@
using android::netdutils::MockSyscalls;
using android::netdutils::Slice;
using android::netdutils::Status;
-using android::netdutils::StatusOr;
-using android::netdutils::Syscalls;
using ::testing::_;
using ::testing::DoAll;
diff --git a/server/main.cpp b/server/main.cpp
index fd0856e..fc58547 100644
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -35,7 +35,6 @@
#include <android-base/properties.h>
#include <binder/IPCThreadState.h>
#include <binder/IServiceManager.h>
-#include <binder/ProcessState.h>
#include "CommandListener.h"
#include "Controllers.h"
@@ -51,18 +50,15 @@
#include "netd_resolv/resolv_stub.h"
-using android::status_t;
-using android::sp;
using android::IPCThreadState;
-using android::ProcessState;
-using android::defaultServiceManager;
+using android::status_t;
using android::net::CommandListener;
using android::net::FwmarkServer;
+using android::net::makeNFLogListener;
using android::net::NetdHwService;
using android::net::NetdNativeService;
using android::net::NetlinkManager;
using android::net::NFLogListener;
-using android::net::makeNFLogListener;
const char* const PID_FILE_PATH = "/data/misc/net/netd_pid";
constexpr const char DNSPROXYLISTENER_SOCKET_NAME[] = "dnsproxyd";
@@ -70,8 +66,8 @@
std::mutex android::net::gBigNetdLock;
int main() {
- using android::net::gLog;
using android::net::gCtls;
+ using android::net::gLog;
Stopwatch s;
gLog.info("netd 1.0 starting");