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/SockDiag.cpp

diff --git a/server/SockDiag.cpp b/server/SockDiag.cpp
index cd66040..5caf347 100644
--- a/server/SockDiag.cpp
+++ b/server/SockDiag.cpp
@@ -329,7 +329,7 @@
     return mSocketsDestroyed;
 }
 
-int SockDiag::destroyLiveSockets(DestroyFilter destroyFilter, const char *what,
+int SockDiag::destroyLiveSockets(const DestroyFilter& destroyFilter, const char *what,
                                  iovec *iov, int iovcnt) {
     const int proto = IPPROTO_TCP;
     const uint32_t states = (1 << TCP_ESTABLISHED) | (1 << TCP_SYN_SENT) | (1 << TCP_SYN_RECV);
@@ -423,16 +423,10 @@
         return ret;
     }
 
-    std::vector<uid_t> skipUidStrings;
-    for (uid_t uid : skipUids) {
-        skipUidStrings.push_back(uid);
-    }
-    std::sort(skipUidStrings.begin(), skipUidStrings.end());
-
     if (mSocketsDestroyed > 0) {
         ALOGI("Destroyed %d sockets for %s skip={%s} in %.1f ms",
               mSocketsDestroyed, uidRanges.toString().c_str(),
-              android::base::Join(skipUidStrings, " ").c_str(), s.timeTaken());
+              android::base::Join(skipUids, " ").c_str(), s.timeTaken());
     }
 
     return 0;