commit 3723fc4f87fde406a85eaacd54d1aa2d21709bb4
author Greg Hartman <ghartman@google.com> Wed Dec 20 16:25:09 2017 -0800
committer Greg Hartman <ghartman@google.com> Thu Jan 11 20:28:15 2018 -0800
tree fcf194993757ba1ec99c5951e5fbe18598f6a395
parent a9a2ea4d57fa0a80974da3b56c8d3fae2754aaa9

Additional fixes for warnings

BUG: 70865594
Test: Local build and boot
Change-Id: Ia870db4c7e1f4d9927781af54fb93c6a86a6f6ca
Merged-In: Ia870db4c7e1f4d9927781af54fb93c6a86a6f6ca
(cherry picked from commit 6cd78cc8e78a8ee0736385a3285c1dbd9522cf28)

common/libs/wifi/packet_switch.cc

diff --git a/common/libs/wifi/packet_switch.cc b/common/libs/wifi/packet_switch.cc
index 04c0593..8202821 100644
--- a/common/libs/wifi/packet_switch.cc
+++ b/common/libs/wifi/packet_switch.cc
@@ -60,7 +60,7 @@
 #ifdef CUTTLEFISH_HOST
       LOG(INFO) << "Awaiting packet.";
 #endif
-        auto len = shm_wifi_.Recv(msg.get(), maxlen);
+      shm_wifi_.Recv(msg.get(), maxlen);
 #ifdef CUTTLEFISH_HOST
       LOG(INFO) << "Received packet.";
 #endif

guest/commands/wifirouter/router.cc

diff --git a/guest/commands/wifirouter/router.cc b/guest/commands/wifirouter/router.cc
index 7e9d6df..a91abd7 100644
--- a/guest/commands/wifirouter/router.cc
+++ b/guest/commands/wifirouter/router.cc
@@ -47,20 +47,20 @@
 // Copied out of mac80211_hwsim.h header.
 constexpr int HWSIM_CMD_REGISTER = 1;
 constexpr int HWSIM_CMD_FRAME = 2;
-constexpr int HWSIM_CMD_TX_INFO_FRAME = 3;
+constexpr int HWSIM_CMD_TX_INFO_FRAME __unused = 3;
 
-constexpr int HWSIM_TX_CTL_REQ_TX_STATUS = 1;
-constexpr int HWSIM_TX_CTL_NO_ACK = 2;
-constexpr int HWSIM_TX_STAT_ACK = 4;
+constexpr int HWSIM_TX_CTL_REQ_TX_STATUS __unused = 1;
+constexpr int HWSIM_TX_CTL_NO_ACK __unused = 2;
+constexpr int HWSIM_TX_STAT_ACK __unused = 4;
 
 constexpr int HWSIM_ATTR_ADDR_RECEIVER = 1;
 constexpr int HWSIM_ATTR_ADDR_TRANSMITTER = 2;
 constexpr int HWSIM_ATTR_FRAME = 3;
-constexpr int HWSIM_ATTR_FLAGS = 4;
+constexpr int HWSIM_ATTR_FLAGS __unused = 4;
 constexpr int HWSIM_ATTR_RX_RATE = 5;
 constexpr int HWSIM_ATTR_SIGNAL = 6;
-constexpr int HWSIM_ATTR_TX_INFO = 7;
-constexpr int HWSIM_ATTR_COOKIE = 8;
+constexpr int HWSIM_ATTR_TX_INFO __unused = 7;
+constexpr int HWSIM_ATTR_COOKIE __unused = 8;
 constexpr int HWSIM_ATTR_MAX = 19;
 
 // Name of the WIFI SIM Netlink Family.

guest/frontend/vnc_server/virtual_inputs.cpp

diff --git a/guest/frontend/vnc_server/virtual_inputs.cpp b/guest/frontend/vnc_server/virtual_inputs.cpp
index bd6ebdd..0deffa2 100644
--- a/guest/frontend/vnc_server/virtual_inputs.cpp
+++ b/guest/frontend/vnc_server/virtual_inputs.cpp
@@ -221,7 +221,7 @@
 
 VirtualInputs::VirtualInputs() {
   bool open = input_events_region_view_.Open();
-  LOG_FATAL_IF(!open, "Failed to open Input events region view");
+  LOG_ALWAYS_FATAL_IF(!open, "Failed to open Input events region view");
   AddKeyMappings(&keymapping_);
 }