commit c5d4a2f92378930b93484b1092f0ec8f5f266428
author Maciej Żenczykowski <maze@google.com> Mon May 25 19:50:51 2020 +0000
committer Maciej Zenczykowski <maze@google.com> Mon May 25 20:26:16 2020 +0000
tree 0d4efcb4a2c8eeaf5f8acfab1bf2b6d85f785c5f
parent 1ec24537a4fab0f8fe41b2930941b852df2a8c19

BandwidthController - cleanup some needless StringPrintf's

Tested: atest
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Icbfc7066ce597ecfe6b991d1e9af7a9e9739201c
Merged-In: Icbfc7066ce597ecfe6b991d1e9af7a9e9739201c

server/BandwidthController.cpp

diff --git a/server/BandwidthController.cpp b/server/BandwidthController.cpp
index a179872..e48fc32 100644
--- a/server/BandwidthController.cpp
+++ b/server/BandwidthController.cpp
@@ -243,8 +243,7 @@
             // respectively)
             ("-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)
+            useBpf ? "-A bw_raw_PREROUTING -m bpf --object-pinned " XT_BPF_INGRESS_PROG_PATH
                    : "-A bw_raw_PREROUTING -m owner --socket-exists",
             "COMMIT",
 
@@ -256,8 +255,7 @@
             useBpf ? "" : "-A bw_mangle_POSTROUTING -m owner --socket-exists",
             StringPrintf("-A bw_mangle_POSTROUTING -j MARK --set-mark 0x0/0x%x",
                          uidBillingMask),  // Clear the mark before sending this packet
-            useBpf ? StringPrintf("-A bw_mangle_POSTROUTING -m bpf --object-pinned %s",
-                                  XT_BPF_EGRESS_PROG_PATH)
+            useBpf ? "-A bw_mangle_POSTROUTING -m bpf --object-pinned " XT_BPF_EGRESS_PROG_PATH
                    : "",
             COMMIT_AND_CLOSE};
     return ipt_basic_accounting_commands;