commit 15bb55c11df22b4752297f38b10afd9e48806d87
author Bernie Innocenti <codewiz@google.com> Sun Jun 03 16:19:51 2018 +0900
committer Bernie Innocenti <codewiz@google.com> Thu Jun 07 16:31:04 2018 +0900
tree 6a89c1b621b2a642bb9d08865847ee263ea1e693
parent 992d7476b63b736b5f41e8b548d88a79db999fc4

netd: Enable clang-tidy and fix all warnings

Bug: 65246407
Test: m netd && system/netd/tests/runtests.sh
Change-Id: I1d22b2bc317fe7218ccde78859ed0623d6a1f8df

server/TrafficControllerTest.cpp

diff --git a/server/TrafficControllerTest.cpp b/server/TrafficControllerTest.cpp
index a354f83..43efc4e 100644
--- a/server/TrafficControllerTest.cpp
+++ b/server/TrafficControllerTest.cpp
@@ -128,7 +128,7 @@
     }
 
     int setUpSocketAndTag(int protocol, uint64_t* cookie, uint32_t tag, uid_t uid) {
-        int sock = socket(protocol, SOCK_STREAM, 0);
+        int sock = socket(protocol, SOCK_STREAM | SOCK_CLOEXEC, 0);
         EXPECT_LE(0, sock);
         *cookie = getSocketCookie(sock);
         EXPECT_NE(NONEXISTENT_COOKIE, *cookie);
@@ -293,7 +293,7 @@
 
     int invalidSocket = -1;
     ASSERT_GT(0, mTc.untagSocket(invalidSocket));
-    int v4socket = socket(AF_INET, SOCK_STREAM, 0);
+    int v4socket = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0);
     ASSERT_GT(0, mTc.untagSocket(v4socket));
     expectTagMapEmpty();
 }