nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-16 23:42:43 +01:00
Code Activity

Modernize AutoCloseFD

Browse source
This commit is contained in:
Shea Levy 2016-07-11 15:44:44 -04:00
parent 8a41792d43
commit cb5e7254b6
11 changed files with 139 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libstore/remote-store.cc
View file

@ -66,9 +66,9 @@ ref<RemoteStore::Connection> RemoteStore::openConnection()
| SOCK_CLOEXEC
#endif
, 0);
if (conn->fd == -1)
if (!conn->fd)
throw SysError("cannot create Unix domain socket");
closeOnExec(conn->fd);
closeOnExec(conn->fd.get());
string socketPath = settings.nixDaemonSocketFile;
@ -78,11 +78,11 @@ ref<RemoteStore::Connection> RemoteStore::openConnection()
throw Error(format("socket path ‘%1%’ is too long") % socketPath);
strcpy(addr.sun_path, socketPath.c_str());
if (connect(conn->fd, (struct sockaddr *) &addr, sizeof(addr)) == -1)
if (connect(conn->fd.get(), (struct sockaddr *) &addr, sizeof(addr)) == -1)
throw SysError(format("cannot connect to daemon at ‘%1%’") % socketPath);
conn->from.fd = conn->fd;
conn->to.fd = conn->fd;
conn->from.fd = conn->fd.get();
conn->to.fd = conn->fd.get();
/* Send the magic greeting, check for the reply. */
try {
@ -531,7 +531,7 @@ RemoteStore::Connection::~Connection()
{
try {
to.flush();
fd.close();
fd = -1;
} catch (...) {
ignoreException();
}