commit a01d6eff4316c6c10e81bd8d48ae85aa82b933e3
author Sreeram Ramachandran <sreeram@google.com> Thu Apr 10 19:37:59 2014 -0700
committer Sreeram Ramachandran <sreeram@google.com> Tue May 13 22:50:46 2014 +0000
tree 663575ad32f0417549571d7b390b4d9c090f3f84
parent a48118062412f16ae712bfc8c8a539d3b6a85e47

Cleanup: Minor style fixes.

(cherry picked from commit 49d905456fd6cf730abdddb49df84d6032b0a419)

Change-Id: I199447f03ce33d79007e62e23ccf683ed4249f97

RouteController.cpp

diff --git a/RouteController.cpp b/RouteController.cpp
index 4c56226..fbd1b00 100644
--- a/RouteController.cpp
+++ b/RouteController.cpp
@@ -74,10 +74,10 @@
         return false;
     }
 
-    char table_string[sizeof("0x12345678")];
-    snprintf(table_string, sizeof(table_string), "0x%x", table);
+    char tableString[sizeof("0x12345678")];
+    snprintf(tableString, sizeof(tableString), "0x%x", table);
 
-    char mark_string[sizeof("0x12345678/0x12345678")];
+    char markString[sizeof("0x12345678/0x12345678")];
     const char* action = add ? ADD : DEL;
 
     // A rule to route traffic based on an explicitly chosen network.
@@ -89,8 +89,8 @@
     uint32_t fwmark = getFwmark(netId, FWMARK_USE_EXPLICIT, !FWMARK_USE_PROTECT, permission);
     uint32_t mask = getFwmarkMask(FWMARK_USE_NET_ID, FWMARK_USE_EXPLICIT, !FWMARK_USE_PROTECT,
                                   permission);
-    snprintf(mark_string, sizeof(mark_string), "0x%x/0x%x", fwmark, mask);
-    if (!runIpRuleCommand(action, RULE_PRIORITY_PER_NETWORK_EXPLICIT, table_string, mark_string,
+    snprintf(markString, sizeof(markString), "0x%x/0x%x", fwmark, mask);
+    if (!runIpRuleCommand(action, RULE_PRIORITY_PER_NETWORK_EXPLICIT, tableString, markString,
                           NULL)) {
         return false;
     }
@@ -101,8 +101,8 @@
     // knows the outgoing interface (typically for link-local communications).
     fwmark = getFwmark(0, !FWMARK_USE_EXPLICIT, !FWMARK_USE_PROTECT, permission);
     mask = getFwmark(!FWMARK_USE_NET_ID, !FWMARK_USE_EXPLICIT, !FWMARK_USE_PROTECT, permission);
-    snprintf(mark_string, sizeof(mark_string), "0x%x/0x%x", fwmark, mask);
-    if (!runIpRuleCommand(action, RULE_PRIORITY_PER_NETWORK_OIF, table_string, mark_string,
+    snprintf(markString, sizeof(markString), "0x%x/0x%x", fwmark, mask);
+    if (!runIpRuleCommand(action, RULE_PRIORITY_PER_NETWORK_OIF, tableString, markString,
                           interface)) {
         return false;
     }
@@ -114,8 +114,8 @@
     // network stay on that network even if the default network changes.
     fwmark = getFwmark(netId, !FWMARK_USE_EXPLICIT, !FWMARK_USE_PROTECT, permission);
     mask = getFwmarkMask(FWMARK_USE_NET_ID, !FWMARK_USE_EXPLICIT, !FWMARK_USE_PROTECT, permission);
-    snprintf(mark_string, sizeof(mark_string), "0x%x/0x%x", fwmark, mask);
-    if (!runIpRuleCommand(action, RULE_PRIORITY_PER_NETWORK_NORMAL, table_string, mark_string,
+    snprintf(markString, sizeof(markString), "0x%x/0x%x", fwmark, mask);
+    if (!runIpRuleCommand(action, RULE_PRIORITY_PER_NETWORK_NORMAL, tableString, markString,
                           NULL)) {
         return false;
     }
@@ -128,9 +128,9 @@
     // + Mark sockets that accept connections from this interface so that the connection stays on
     //   the same interface.
     action = add ? "-A" : "-D";
-    snprintf(mark_string, sizeof(mark_string), "0x%x", netId);
+    snprintf(markString, sizeof(markString), "0x%x", netId);
     if (execIptables(V4V6, "-t", "mangle", action, "INPUT", "-i", interface, "-j", "MARK",
-                     "--set-mark", mark_string, NULL)) {
+                     "--set-mark", markString, NULL)) {
         return false;
     }