commit 46a1d53381f897b0ed256cafd79ad8f9cca0948f
author Greg Kaiser <gkaiser@google.com> Tue Mar 26 12:10:58 2019 -0700
committer Greg Kaiser <gkaiser@google.com> Tue Mar 26 12:10:58 2019 -0700
tree 8d25c94dfec506eb62821a921af5a2c256b113d7
parent 5e81d4d8f4a845f004de0c3d5510497bf24c9881

binder_test: Avoid extra std::string copies

When a function argument is a const std::string reference, it's
inefficient to pass a std::string::c_str().  We're not particularly
concerned about the performance of this test, but by fixing up
this issue, it makes using static analysis to find this issue in
our code base less noisy.

Test: TreeHugger
Change-Id: I69fefcaa480ca6b0106e3362821acd73052668b9

tests/binder_test.cpp

diff --git a/tests/binder_test.cpp b/tests/binder_test.cpp
index bb569e9..ad0dfef 100644
--- a/tests/binder_test.cpp
+++ b/tests/binder_test.cpp
@@ -1222,8 +1222,8 @@
     std::string uidRule = StringPrintf("owner UID match %u", uid);
     std::string perUidChain = StringPrintf("st_clear_caught_%u", uid);
     for (const auto& binary : {IPTABLES_PATH, IP6TABLES_PATH}) {
-        EXPECT_FALSE(iptablesRuleExists(binary, STRICT_OUTPUT, uidRule.c_str()));
-        EXPECT_FALSE(iptablesRuleExists(binary, STRICT_CLEAR_CAUGHT, uidRule.c_str()));
+        EXPECT_FALSE(iptablesRuleExists(binary, STRICT_OUTPUT, uidRule));
+        EXPECT_FALSE(iptablesRuleExists(binary, STRICT_CLEAR_CAUGHT, uidRule));
         EXPECT_EQ(0, iptablesRuleLineLength(binary, perUidChain.c_str()));
     }
 }
@@ -1233,8 +1233,8 @@
     std::string uidRule = StringPrintf("owner UID match %u", uid);
     std::string perUidChain = StringPrintf("st_clear_caught_%u", uid);
     for (const auto& binary : {IPTABLES_PATH, IP6TABLES_PATH}) {
-        EXPECT_TRUE(iptablesRuleExists(binary, STRICT_OUTPUT, uidRule.c_str()));
-        EXPECT_TRUE(iptablesRuleExists(binary, STRICT_CLEAR_CAUGHT, uidRule.c_str()));
+        EXPECT_TRUE(iptablesRuleExists(binary, STRICT_OUTPUT, uidRule));
+        EXPECT_TRUE(iptablesRuleExists(binary, STRICT_CLEAR_CAUGHT, uidRule));
         EXPECT_TRUE(iptablesRuleExists(binary, perUidChain.c_str(), logRule));
     }
 }
@@ -1244,8 +1244,8 @@
     std::string uidRule = StringPrintf("owner UID match %u", uid);
     std::string perUidChain = StringPrintf("st_clear_caught_%u", uid);
     for (const auto& binary : {IPTABLES_PATH, IP6TABLES_PATH}) {
-        EXPECT_TRUE(iptablesRuleExists(binary, STRICT_OUTPUT, uidRule.c_str()));
-        EXPECT_TRUE(iptablesRuleExists(binary, STRICT_CLEAR_CAUGHT, uidRule.c_str()));
+        EXPECT_TRUE(iptablesRuleExists(binary, STRICT_OUTPUT, uidRule));
+        EXPECT_TRUE(iptablesRuleExists(binary, STRICT_CLEAR_CAUGHT, uidRule));
         EXPECT_TRUE(iptablesRuleExists(binary, perUidChain.c_str(), rejectRule));
     }
 }
@@ -1297,7 +1297,7 @@
     std::string cmd = StringPrintf("ps -Af | grep '[0-9] %s'", processName.c_str());
     std::vector<std::string> result;
     for (uint32_t run = 1;;) {
-        result = runCommand(cmd.c_str());
+        result = runCommand(cmd);
         if (result.size() || ++run > maxTries) {
             break;
         }