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

diff --git a/server/oem_iptables_hook.cpp b/server/oem_iptables_hook.cpp
index 1b8a6e4..057020b 100644
--- a/server/oem_iptables_hook.cpp
+++ b/server/oem_iptables_hook.cpp
@@ -22,12 +22,18 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <string>
+
 #define LOG_TAG "OemIptablesHook"
 #include <log/log.h>
 #include <logwrap/logwrap.h>
 #include "NetdConstants.h"
 
-static bool oemCleanupHooks() {
+namespace {
+
+const char OEM_SCRIPT_PATH[] = "/system/bin/oem-iptables-init.sh";
+
+bool oemCleanupHooks() {
     std::string cmd =
         "*filter\n"
         ":oem_out -\n"
@@ -40,8 +46,8 @@
     return (execIptablesRestore(V4V6, cmd) == 0);
 }
 
-static bool oemInitChains() {
-    int ret = system(OEM_SCRIPT_PATH);
+bool oemInitChains() {
+    int ret = system(OEM_SCRIPT_PATH);  // NOLINT(cert-env33-c)
     if ((-1 == ret) || (0 != WEXITSTATUS(ret))) {
         ALOGE("%s failed: %s", OEM_SCRIPT_PATH, strerror(errno));
         oemCleanupHooks();
@@ -50,6 +56,7 @@
     return true;
 }
 
+}  // namespace
 
 void setupOemIptablesHook() {
     if (0 == access(OEM_SCRIPT_PATH, R_OK | X_OK)) {