diff options
| -rw-r--r-- | net/base/host_resolver_impl.cc | 15 | ||||
| -rw-r--r-- | net/base/net_util.cc | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/net/base/host_resolver_impl.cc b/net/base/host_resolver_impl.cc index 2120332..44bbe41 100644 --- a/net/base/host_resolver_impl.cc +++ b/net/base/host_resolver_impl.cc @@ -435,9 +435,9 @@ class HostResolverImpl::IPv6ProbeJob void Start() { DCHECK(IsOnOriginThread()); - const bool IS_SLOW = true; + const bool kIsSlow = true; WorkerPool::PostTask( - FROM_HERE, NewRunnableMethod(this, &IPv6ProbeJob::DoProbe), IS_SLOW); + FROM_HERE, NewRunnableMethod(this, &IPv6ProbeJob::DoProbe), kIsSlow); } // Cancels the current job. @@ -1095,11 +1095,12 @@ void HostResolverImpl::IPv6ProbeSetDefaultAddressFamily( AddressFamily address_family) { DCHECK(address_family == ADDRESS_FAMILY_UNSPECIFIED || address_family == ADDRESS_FAMILY_IPV4); - if (default_address_family_ != address_family) - LOG(INFO) << "IPv6Probe forced AddressFamily setting to " - << ((address_family == ADDRESS_FAMILY_UNSPECIFIED) - ? "ADDRESS_FAMILY_UNSPECIFIED" - : "ADDRESS_FAMILY_IPV4"); + if (default_address_family_ != address_family) { + LOG(INFO) << "IPv6Probe forced AddressFamily setting to " + << ((address_family == ADDRESS_FAMILY_UNSPECIFIED) + ? "ADDRESS_FAMILY_UNSPECIFIED" + : "ADDRESS_FAMILY_IPV4"); + } default_address_family_ = address_family; // Drop reference since the job has called us back. DiscardIPv6ProbeJob(); diff --git a/net/base/net_util.cc b/net/base/net_util.cc index 29d804e..e226659 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -1606,7 +1606,7 @@ bool IPv6Supported() { continue; // Safe cast since this is AF_INET6. struct sockaddr_in6* addr_in6 = - reinterpret_cast<struct sockaddr_in6*>(addr); + reinterpret_cast<struct sockaddr_in6*>(addr); struct in6_addr* sin6_addr = &addr_in6->sin6_addr; if (IN6_IS_ADDR_LOOPBACK(sin6_addr) || IN6_IS_ADDR_LINKLOCAL(sin6_addr)) continue; |