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

Unified Diff: ipc/unix_domain_socket_util.cc

Issue 197873014: Revert of Implement ScopedFD in terms of ScopedGeneric. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ipc/ipc_channel_factory.cc ('k') | media/video/capture/linux/video_capture_device_linux.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/unix_domain_socket_util.cc
diff --git a/ipc/unix_domain_socket_util.cc b/ipc/unix_domain_socket_util.cc
index c29ce929f92479abd94513b0c514ca9145649aff..10df9b214417dcece7e75b2b2a755fab4be22ffe 100644
--- a/ipc/unix_domain_socket_util.cc
+++ b/ipc/unix_domain_socket_util.cc
@@ -13,7 +13,6 @@
#include "base/file_util.h"
#include "base/files/file_path.h"
-#include "base/files/scoped_file.h"
#include "base/logging.h"
#include "base/posix/eintr_wrapper.h"
@@ -46,14 +45,15 @@
}
// Create socket.
- base::ScopedFD fd(socket(AF_UNIX, SOCK_STREAM, 0));
- if (!fd.is_valid()) {
+ int fd = socket(AF_UNIX, SOCK_STREAM, 0);
+ if (fd < 0) {
PLOG(ERROR) << "socket";
return -1;
}
+ file_util::ScopedFD scoped_fd(&fd);
// Make socket non-blocking
- if (HANDLE_EINTR(fcntl(fd.get(), F_SETFL, O_NONBLOCK)) < 0) {
+ if (HANDLE_EINTR(fcntl(fd, F_SETFL, O_NONBLOCK)) < 0) {
PLOG(ERROR) << "fcntl(O_NONBLOCK)";
return -1;
}
@@ -64,7 +64,7 @@
strncpy(unix_addr->sun_path, socket_name.c_str(), kMaxSocketNameLength);
*unix_addr_len =
offsetof(struct sockaddr_un, sun_path) + socket_name.length();
- return fd.release();
+ return *scoped_fd.release();
}
} // namespace
@@ -78,10 +78,10 @@
struct sockaddr_un unix_addr;
size_t unix_addr_len;
- base::ScopedFD fd(
- MakeUnixAddrForPath(socket_name, &unix_addr, &unix_addr_len));
- if (!fd.is_valid())
- return false;
+ int fd = MakeUnixAddrForPath(socket_name, &unix_addr, &unix_addr_len);
+ if (fd < 0)
+ return false;
+ file_util::ScopedFD scoped_fd(&fd);
// Make sure the path we need exists.
if (!base::CreateDirectory(socket_dir)) {
@@ -96,20 +96,20 @@
}
// Bind the socket.
- if (bind(fd.get(), reinterpret_cast<const sockaddr*>(&unix_addr),
+ if (bind(fd, reinterpret_cast<const sockaddr*>(&unix_addr),
unix_addr_len) < 0) {
PLOG(ERROR) << "bind " << socket_path.value();
return false;
}
// Start listening on the socket.
- if (listen(fd.get(), SOMAXCONN) < 0) {
+ if (listen(fd, SOMAXCONN) < 0) {
PLOG(ERROR) << "listen " << socket_path.value();
unlink(socket_name.c_str());
return false;
}
- *server_listen_fd = fd.release();
+ *server_listen_fd = *scoped_fd.release();
return true;
}
@@ -122,18 +122,18 @@
struct sockaddr_un unix_addr;
size_t unix_addr_len;
- base::ScopedFD fd(
- MakeUnixAddrForPath(socket_name, &unix_addr, &unix_addr_len));
- if (!fd.is_valid())
- return false;
-
- if (HANDLE_EINTR(connect(fd.get(), reinterpret_cast<sockaddr*>(&unix_addr),
+ int fd = MakeUnixAddrForPath(socket_name, &unix_addr, &unix_addr_len);
+ if (fd < 0)
+ return false;
+ file_util::ScopedFD scoped_fd(&fd);
+
+ if (HANDLE_EINTR(connect(fd, reinterpret_cast<sockaddr*>(&unix_addr),
unix_addr_len)) < 0) {
PLOG(ERROR) << "connect " << socket_path.value();
return false;
}
- *client_socket = fd.release();
+ *client_socket = *scoped_fd.release();
return true;
}
@@ -184,17 +184,18 @@
DCHECK(server_socket);
*server_socket = -1;
- base::ScopedFD accept_fd(HANDLE_EINTR(accept(server_listen_fd, NULL, 0)));
- if (!accept_fd.is_valid())
+ int accept_fd = HANDLE_EINTR(accept(server_listen_fd, NULL, 0));
+ if (accept_fd < 0)
return IsRecoverableError(errno);
- if (HANDLE_EINTR(fcntl(accept_fd.get(), F_SETFL, O_NONBLOCK)) < 0) {
- PLOG(ERROR) << "fcntl(O_NONBLOCK) " << accept_fd.get();
+ file_util::ScopedFD scoped_fd(&accept_fd);
+ if (HANDLE_EINTR(fcntl(accept_fd, F_SETFL, O_NONBLOCK)) < 0) {
+ PLOG(ERROR) << "fcntl(O_NONBLOCK) " << accept_fd;
// It's safe to keep listening on |server_listen_fd| even if the attempt to
// set O_NONBLOCK failed on the client fd.
return true;
}
- *server_socket = accept_fd.release();
+ *server_socket = *scoped_fd.release();
return true;
}
« no previous file with comments | « ipc/ipc_channel_factory.cc ('k') | media/video/capture/linux/video_capture_device_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698