Chromium Code Reviews| Index: net/base/address_tracker_linux.cc |
| diff --git a/net/base/address_tracker_linux.cc b/net/base/address_tracker_linux.cc |
| index 27dd2019ab0dffd6392dee105b7ae11ba7b6e138..f8ca407875c843554eb1624549dff1d110444722 100644 |
| --- a/net/base/address_tracker_linux.cc |
| +++ b/net/base/address_tracker_linux.cc |
| @@ -59,7 +59,7 @@ bool GetAddress(const struct nlmsghdr* header, |
| local = reinterpret_cast<unsigned char*>(RTA_DATA(attr)); |
| break; |
| case IFA_CACHEINFO: { |
| - const struct ifa_cacheinfo *cache_info = |
| + const struct ifa_cacheinfo* cache_info = |
| reinterpret_cast<const struct ifa_cacheinfo*>(RTA_DATA(attr)); |
| if (really_deprecated) |
| *really_deprecated = (cache_info->ifa_prefered == 0); |
| @@ -172,8 +172,11 @@ void AddressTrackerLinux::Init() { |
| request.header.nlmsg_pid = getpid(); |
| request.msg.rtgen_family = AF_UNSPEC; |
| - rv = HANDLE_EINTR(sendto(netlink_fd_, &request, request.header.nlmsg_len, |
| - 0, reinterpret_cast<struct sockaddr*>(&peer), |
| + rv = HANDLE_EINTR(sendto(netlink_fd_, |
| + &request, |
| + request.header.nlmsg_len, |
| + 0, |
| + reinterpret_cast<struct sockaddr*>(&peer), |
| sizeof(peer))); |
| if (rv < 0) { |
| PLOG(ERROR) << "Could not send NETLINK request"; |
| @@ -191,7 +194,10 @@ void AddressTrackerLinux::Init() { |
| // Request dump of link state |
| request.header.nlmsg_type = RTM_GETLINK; |
| - rv = HANDLE_EINTR(sendto(netlink_fd_, &request, request.header.nlmsg_len, 0, |
| + rv = HANDLE_EINTR(sendto(netlink_fd_, |
| + &request, |
| + request.header.nlmsg_len, |
| + 0, |
| reinterpret_cast<struct sockaddr*>(&peer), |
| sizeof(peer))); |
| if (rv < 0) { |
| @@ -248,8 +254,8 @@ AddressTrackerLinux::GetCurrentConnectionType() { |
| } |
| // TODO(droger): Return something more detailed than CONNECTION_UNKNOWN. |
| // http://crbug.com/160537 |
| - return is_offline_ ? NetworkChangeNotifier::CONNECTION_NONE : |
| - NetworkChangeNotifier::CONNECTION_UNKNOWN; |
| + return is_offline_ ? NetworkChangeNotifier::CONNECTION_NONE |
| + : NetworkChangeNotifier::CONNECTION_UNKNOWN; |
| } |
| void AddressTrackerLinux::ReadMessages(bool* address_changed, |
| @@ -265,7 +271,9 @@ void AddressTrackerLinux::ReadMessages(bool* address_changed, |
| buffer, |
| sizeof(buffer), |
| // Block the first time through loop. |
| - first_loop ? 0 : MSG_DONTWAIT)); |
| + first_loop |
| + ? 0 |
| + : MSG_DONTWAIT)); |
|
davidben
2014/10/10 20:24:15
This looks like a clang-format bug.
|
| first_loop = false; |
| if (rv == 0) { |
| LOG(ERROR) << "Unexpected shutdown of NETLINK socket."; |
| @@ -306,7 +314,8 @@ void AddressTrackerLinux::HandleMessage(char* buffer, |
| const struct nlmsgerr* msg = |
| reinterpret_cast<struct nlmsgerr*>(NLMSG_DATA(header)); |
| LOG(ERROR) << "Unexpected netlink error " << msg->error << "."; |
| - } return; |
| + } |
| + return; |
|
davidben
2014/10/10 20:24:15
Both of these seem pretty off. Move the return ins
|
| case RTM_NEWADDR: { |
| IPAddressNumber address; |
| bool really_deprecated; |
| @@ -393,7 +402,8 @@ void AddressTrackerLinux::OnFileCanReadWithoutBlocking(int fd) { |
| tunnel_callback_.Run(); |
| } |
| -void AddressTrackerLinux::OnFileCanWriteWithoutBlocking(int /* fd */) {} |
| +void AddressTrackerLinux::OnFileCanWriteWithoutBlocking(int /* fd */) { |
| +} |
| void AddressTrackerLinux::CloseSocket() { |
| if (netlink_fd_ >= 0 && IGNORE_EINTR(close(netlink_fd_)) < 0) |