Make clang-tidy happy

This commit is contained in:
Konstantin Bogdanov 2024-09-19 12:51:42 +02:00
parent 61524aabb6
commit c35c20a481
Signed by: thevar1able
GPG Key ID: DB399448D9FE52F1
17 changed files with 26 additions and 26 deletions

View File

@ -112,12 +112,12 @@ public:
}
catch (...)
{
int err = close(fd);
[[maybe_unused]] int err = close(fd);
chassert(!err || errno == EINTR);
throw;
}
int err = close(fd);
[[maybe_unused]] int err = close(fd);
chassert(!err || errno == EINTR);
return res;
}
@ -182,12 +182,12 @@ public:
}
catch (...)
{
int err = close(fd);
[[maybe_unused]] int err = close(fd);
chassert(!err || errno == EINTR);
throw;
}
int err = close(fd);
[[maybe_unused]] int err = close(fd);
chassert(!err || errno == EINTR);
}

View File

@ -95,7 +95,7 @@ Epoll::~Epoll()
{
if (epoll_fd != -1)
{
int err = close(epoll_fd);
[[maybe_unused]] int err = close(epoll_fd);
chassert(!err || errno == EINTR);
}
}

View File

@ -57,7 +57,7 @@ EventFD::~EventFD()
{
if (fd != -1)
{
int err = close(fd);
[[maybe_unused]] int err = close(fd);
chassert(!err || errno == EINTR);
}
}

View File

@ -283,7 +283,7 @@ NetlinkMetricsProvider::NetlinkMetricsProvider()
{
if (netlink_socket_fd >= 0)
{
int err = close(netlink_socket_fd);
[[maybe_unused]] int err = close(netlink_socket_fd);
chassert(!err || errno == EINTR);
}
throw;
@ -320,7 +320,7 @@ NetlinkMetricsProvider::~NetlinkMetricsProvider()
{
if (netlink_socket_fd >= 0)
{
int err = close(netlink_socket_fd);
[[maybe_unused]] int err = close(netlink_socket_fd);
chassert(!err || errno == EINTR);
}
}

View File

@ -98,7 +98,7 @@ ProcfsMetricsProvider::ProcfsMetricsProvider(pid_t /*tid*/)
thread_stat_fd = ::open(thread_stat, O_RDONLY | O_CLOEXEC);
if (-1 == thread_stat_fd)
{
int err = ::close(thread_schedstat_fd);
[[maybe_unused]] int err = ::close(thread_schedstat_fd);
chassert(!err || errno == EINTR);
throwWithFailedToOpenFile(thread_stat);
}

View File

@ -100,7 +100,7 @@ StatusFile::StatusFile(std::string path_, FillFunction fill_)
}
catch (...)
{
int err = close(fd);
[[maybe_unused]] int err = close(fd);
chassert(!err || errno == EINTR);
throw;
}

View File

@ -112,7 +112,7 @@ static PollPidResult pollPid(pid_t pid, int timeout_in_ms)
if (ready <= 0)
return PollPidResult::FAILED;
int err = close(pid_fd);
[[maybe_unused]] int err = close(pid_fd);
chassert(!err || errno == EINTR);
return PollPidResult::RESTART;

View File

@ -777,14 +777,14 @@ static int bufferFromFile(LoggerPtr log, const std::string & path, nuraft::ptr<n
if (chunk == MAP_FAILED)
{
LOG_WARNING(log, "Error mmapping {}, error: {}, errno: {}", path, errnoToString(), errno);
int err = ::close(fd);
[[maybe_unused]] int err = ::close(fd);
chassert(!err || errno == EINTR);
return errno;
}
data_out = nuraft::buffer::alloc(file_size);
data_out->put_raw(chunk, file_size);
::munmap(chunk, file_size);
int err = ::close(fd);
[[maybe_unused]] int err = ::close(fd);
chassert(!err || errno == EINTR);
return 0;
}

View File

@ -330,7 +330,7 @@ void BaseDaemon::initialize(Application & self)
throw Poco::OpenFileException("File " + stderr_path + " (logger.stderr) is not writable");
if (fd != -1)
{
int err = ::close(fd);
[[maybe_unused]] int err = ::close(fd);
chassert(!err || errno == EINTR);
}
}

View File

@ -769,7 +769,7 @@ private:
if (this == &rhs)
return *this;
int err = ::close(fd);
[[maybe_unused]] int err = ::close(fd);
chassert(!err || errno == EINTR);
fd = rhs.fd;
@ -780,7 +780,7 @@ private:
{
if (fd != -1)
{
int err = close(fd);
[[maybe_unused]] int err = close(fd);
chassert(!err || errno == EINTR);
}
}

View File

@ -82,7 +82,7 @@ AsynchronousReadBufferFromFile::~AsynchronousReadBufferFromFile()
if (fd < 0)
return;
int err = ::close(fd);
[[maybe_unused]] int err = ::close(fd);
chassert(!err || errno == EINTR);
}

View File

@ -77,7 +77,7 @@ ReadBufferFromFile::~ReadBufferFromFile()
if (fd < 0)
return;
int err = ::close(fd);
[[maybe_unused]] int err = ::close(fd);
chassert(!err || errno == EINTR);
}

View File

@ -91,7 +91,7 @@ WriteBufferFromFile::~WriteBufferFromFile()
tryLogCurrentException(__PRETTY_FUNCTION__);
}
int err = ::close(fd);
[[maybe_unused]] int err = ::close(fd);
/// Everything except for EBADF should be ignored in dtor, since all of
/// others (EINTR/EIO/ENOSPC/EDQUOT) could be possible during writing to
/// fd, and then write already failed and the error had been reported to

View File

@ -47,7 +47,7 @@ static ConfigProcessor::LoadedConfig loadConfigurationFromString(std::string & s
{
throw std::runtime_error("unable write to temp file");
}
int error = close(fd);
[[maybe_unused]] int error = close(fd);
chassert(!error);
auto config_path = std::string(tmp_file) + ".xml";

View File

@ -141,12 +141,12 @@ RemoteQueryExecutorReadContext::~RemoteQueryExecutorReadContext()
/// connection_fd is closed by Poco::Net::Socket or Epoll
if (pipe_fd[0] != -1)
{
int err = close(pipe_fd[0]);
[[maybe_unused]] int err = close(pipe_fd[0]);
chassert(!err || errno == EINTR);
}
if (pipe_fd[1] != -1)
{
int err = close(pipe_fd[1]);
[[maybe_unused]] int err = close(pipe_fd[1]);
chassert(!err || errno == EINTR);
}
}

View File

@ -93,7 +93,7 @@ struct SocketInterruptablePollWrapper
socket_event.data.fd = sockfd;
if (epoll_ctl(epollfd, EPOLL_CTL_ADD, sockfd, &socket_event) < 0)
{
int err = ::close(epollfd);
[[maybe_unused]] int err = ::close(epollfd);
chassert(!err || errno == EINTR);
throw ErrnoException(ErrorCodes::SYSTEM_ERROR, "Cannot insert socket into epoll queue");
@ -102,7 +102,7 @@ struct SocketInterruptablePollWrapper
pipe_event.data.fd = pipe.fds_rw[0];
if (epoll_ctl(epollfd, EPOLL_CTL_ADD, pipe.fds_rw[0], &pipe_event) < 0)
{
int err = ::close(epollfd);
[[maybe_unused]] int err = ::close(epollfd);
chassert(!err || errno == EINTR);
throw ErrnoException(ErrorCodes::SYSTEM_ERROR, "Cannot insert socket into epoll queue");
@ -211,7 +211,7 @@ struct SocketInterruptablePollWrapper
#if defined(POCO_HAVE_FD_EPOLL)
~SocketInterruptablePollWrapper()
{
int err = ::close(epollfd);
[[maybe_unused]] int err = ::close(epollfd);
chassert(!err || errno == EINTR);
}
#endif

View File

@ -134,7 +134,7 @@ void DirectoryWatcherBase::watchFunc()
DirectoryWatcherBase::~DirectoryWatcherBase()
{
stop();
int err = ::close(inotify_fd);
[[maybe_unused]] int err = ::close(inotify_fd);
chassert(!err || errno == EINTR);
}