ethernet_interface: Fix variable naming
The new function names introduced by
6aef769f1d2e8015b98cb3d8d6c20a81d60f1be0 caused a naming conflict with
local variables. Update the local variable names to fix the conflict.
Change-Id: Ib916b347bcb683dd352943dccf57d806669f33f7
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/ethernet_interface.cpp b/ethernet_interface.cpp
index 4f0ceab..607e658 100644
--- a/ethernet_interface.cpp
+++ b/ethernet_interface.cpp
@@ -363,12 +363,12 @@
Autoneg autoneg{0};
DuplexMode duplex{0};
LinkUp linkState{false};
- NICEnabled nicEnabled{false};
+ NICEnabled enabled{false};
EthernetIntfSocket eifSocket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
if (eifSocket.sock < 0)
{
- return std::make_tuple(speed, duplex, autoneg, linkState, nicEnabled);
+ return std::make_tuple(speed, duplex, autoneg, linkState, enabled);
}
std::strncpy(ifr.ifr_name, interfaceName().c_str(), IFNAMSIZ - 1);
@@ -382,10 +382,10 @@
autoneg = edata.autoneg;
}
- nicEnabled = nicEnabled();
+ enabled = nicEnabled();
linkState = linkUp();
- return std::make_tuple(speed, duplex, autoneg, linkState, nicEnabled);
+ return std::make_tuple(speed, duplex, autoneg, linkState, enabled);
}
#endif