commit ece434ac8bd1cde30c6d98e100940b27693c5bcb
author Maciej Żenczykowski <maze@google.com> Wed Apr 22 09:43:39 2020 +0000
committer Maciej Zenczykowski <maze@google.com> Wed Apr 22 13:42:32 2020 +0000
tree 4195cf18f2f55b0a59e80d05ef07962493f8ee8e
parent 2713b66e0fc1223a678849fa0abb2c70a7a1e5cb

BandwidthController - fix bugprone-suspicious-missing-comma warnings

Fixes:
  system/netd/server/BandwidthController.cpp:230:13: warning: suspicious string literal, probably missing a comma [bugprone-suspicious-missing-comma]

(and fixing that reveals more that I'm also fixing)

Note: Using parenthesis seems better than marking with
  // NOLINTNEXTLINE(bugprone-suspicious-missing-comma)

Test: builds
Bug: 153035880
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I95d3b1cda93e5a55504e6cd94a795e259863d47f
Merged-In: I95d3b1cda93e5a55504e6cd94a795e259863d47f

server/BandwidthController.cpp

diff --git a/server/BandwidthController.cpp b/server/BandwidthController.cpp
index 363cba0..cddaa96 100644
--- a/server/BandwidthController.cpp
+++ b/server/BandwidthController.cpp
@@ -227,7 +227,7 @@
             "-A bw_OUTPUT -j bw_global_alert",
             // Prevents IPSec double counting (Tunnel mode and Transport mode,
             // respectively)
-            "-A bw_OUTPUT -o " IPSEC_IFACE_PREFIX "+ -j RETURN",
+            ("-A bw_OUTPUT -o " IPSEC_IFACE_PREFIX "+ -j RETURN"),
             "-A bw_OUTPUT -m policy --pol ipsec --dir out -j RETURN",
             useBpf ? "" : "-A bw_OUTPUT -m owner --socket-exists",
 
@@ -241,7 +241,7 @@
             "*raw",
             // Prevents IPSec double counting (Tunnel mode and Transport mode,
             // respectively)
-            "-A bw_raw_PREROUTING -i " IPSEC_IFACE_PREFIX "+ -j RETURN",
+            ("-A bw_raw_PREROUTING -i " IPSEC_IFACE_PREFIX "+ -j RETURN"),
             "-A bw_raw_PREROUTING -m policy --pol ipsec --dir in -j RETURN",
             useBpf ? StringPrintf("-A bw_raw_PREROUTING -m bpf --object-pinned %s",
                                   XT_BPF_INGRESS_PROG_PATH)
@@ -251,7 +251,7 @@
             "*mangle",
             // Prevents IPSec double counting (Tunnel mode and Transport mode,
             // respectively)
-            "-A bw_mangle_POSTROUTING -o " IPSEC_IFACE_PREFIX "+ -j RETURN",
+            ("-A bw_mangle_POSTROUTING -o " IPSEC_IFACE_PREFIX "+ -j RETURN"),
             "-A bw_mangle_POSTROUTING -m policy --pol ipsec --dir out -j RETURN",
             useBpf ? "" : "-A bw_mangle_POSTROUTING -m owner --socket-exists",
             StringPrintf("-A bw_mangle_POSTROUTING -j MARK --set-mark 0x0/0x%x",