Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(729)

Side by Side Diff: net/base/address_tracker_linux.cc

Issue 100253002: Don't HANDLE_EINTR(close). Either IGNORE_EINTR(close) or just close. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/base/user_input_monitor_linux.cc ('k') | net/base/net_util_posix.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/base/address_tracker_linux.h" 5 #include "net/base/address_tracker_linux.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <linux/if.h> 8 #include <linux/if.h>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 ReadMessages(&address_changed, &link_changed); 299 ReadMessages(&address_changed, &link_changed);
300 if (address_changed) 300 if (address_changed)
301 address_callback_.Run(); 301 address_callback_.Run();
302 if (link_changed) 302 if (link_changed)
303 link_callback_.Run(); 303 link_callback_.Run();
304 } 304 }
305 305
306 void AddressTrackerLinux::OnFileCanWriteWithoutBlocking(int /* fd */) {} 306 void AddressTrackerLinux::OnFileCanWriteWithoutBlocking(int /* fd */) {}
307 307
308 void AddressTrackerLinux::CloseSocket() { 308 void AddressTrackerLinux::CloseSocket() {
309 if (netlink_fd_ >= 0 && HANDLE_EINTR(close(netlink_fd_)) < 0) 309 if (netlink_fd_ >= 0 && IGNORE_EINTR(close(netlink_fd_)) < 0)
310 PLOG(ERROR) << "Could not close NETLINK socket."; 310 PLOG(ERROR) << "Could not close NETLINK socket.";
311 netlink_fd_ = -1; 311 netlink_fd_ = -1;
312 } 312 }
313 313
314 } // namespace internal 314 } // namespace internal
315 } // namespace net 315 } // namespace net
OLDNEW
« no previous file with comments | « media/base/user_input_monitor_linux.cc ('k') | net/base/net_util_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698