From 689ef502f5b0655c9923ed77da2ae3504630f473 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 20 May 2020 22:27:37 +0100 Subject: refactor(3p/nix): Apply clang-tidy's readability-* fixes This applies the readability fixes listed here: https://clang.llvm.org/extra/clang-tidy/checks/list.html --- third_party/nix/src/libstore/pathlocks.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'third_party/nix/src/libstore/pathlocks.cc') diff --git a/third_party/nix/src/libstore/pathlocks.cc b/third_party/nix/src/libstore/pathlocks.cc index ac6d260f8414..eeee5ee1e9c9 100644 --- a/third_party/nix/src/libstore/pathlocks.cc +++ b/third_party/nix/src/libstore/pathlocks.cc @@ -53,9 +53,8 @@ bool lockFile(int fd, LockType lockType, bool wait) { checkInterrupt(); if (errno != EINTR) { throw SysError(format("acquiring/releasing lock")); - } else { - return false; } + return false; } } else { while (flock(fd, type | LOCK_NB) != 0) { @@ -104,7 +103,7 @@ bool PathLocks::lockPaths(const PathSet& paths, const string& waitMsg, /* Acquire an exclusive lock. */ if (!lockFile(fd.get(), ltWrite, false)) { if (wait) { - if (waitMsg != "") { + if (!waitMsg.empty()) { LOG(WARNING) << waitMsg; } lockFile(fd.get(), ltWrite, true); -- cgit 1.4.1