shill: Naming and lint cleanup pass
Reduce some double-speak in IPAddress constants. Do a cursory
glint pass and clean up a few no-brainer issues.
BUG=None
TEST=Re-run unit tests
Change-Id: I063cd72111bd1f6321f81c6c6591b9f51d87434d
Reviewed-on: http://gerrit.chromium.org/gerrit/7181
Reviewed-by: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
diff --git a/ip_address.cc b/ip_address.cc
index 369e7d4..d1334d0 100644
--- a/ip_address.cc
+++ b/ip_address.cc
@@ -14,11 +14,11 @@
namespace shill {
// static
-const IPAddress::Family IPAddress::kAddressFamilyUnknown = AF_UNSPEC;
+const IPAddress::Family IPAddress::kFamilyUnknown = AF_UNSPEC;
// static
-const IPAddress::Family IPAddress::kAddressFamilyIPv4 = AF_INET;
+const IPAddress::Family IPAddress::kFamilyIPv4 = AF_INET;
// static
-const IPAddress::Family IPAddress::kAddressFamilyIPv6 = AF_INET6;
+const IPAddress::Family IPAddress::kFamilyIPv6 = AF_INET6;
IPAddress::IPAddress(Family family, const ByteString &address)
: family_(family) ,
@@ -40,9 +40,9 @@
int IPAddress::GetAddressLength(Family family) {
switch (family) {
- case kAddressFamilyIPv4:
+ case kFamilyIPv4:
return sizeof(in_addr);
- case kAddressFamilyIPv6:
+ case kFamilyIPv6:
return sizeof(in6_addr);
default:
return 0;