From a25bd32c1093d1cf735fce068baec131a6cb0e69 Mon Sep 17 00:00:00 2001 From: Leo Zhang Date: Sat, 7 Apr 2018 22:11:48 +0800 Subject: [PATCH] common: retry_sys_call no need take address of a function pointer Signed-off-by: Leo Zhang --- src/common/admin_socket.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/common/admin_socket.cc b/src/common/admin_socket.cc index 4e014ae2d868a..d23ca645169f5 100644 --- a/src/common/admin_socket.cc +++ b/src/common/admin_socket.cc @@ -61,7 +61,7 @@ static void remove_cleanup_file(std::string_view file) { if (auto i = std::find(cleanup_files.cbegin(), cleanup_files.cend(), file); i != cleanup_files.cend()) { - retry_sys_call(&::unlink, i->c_str()); + retry_sys_call(::unlink, i->c_str()); cleanup_files.erase(i); } } @@ -69,7 +69,7 @@ static void remove_cleanup_file(std::string_view file) { void remove_all_cleanup_files() { std::unique_lock l(cleanup_lock); for (const auto& s : cleanup_files) { - retry_sys_call(&::unlink, s.c_str()); + retry_sys_call(::unlink, s.c_str()); } cleanup_files.clear(); } @@ -124,7 +124,7 @@ std::string AdminSocket::destroy_shutdown_pipe() int ret = safe_write(m_shutdown_wr_fd, buf, sizeof(buf)); // Close write end - retry_sys_call(&::close, m_shutdown_wr_fd); + retry_sys_call(::close, m_shutdown_wr_fd); m_shutdown_wr_fd = -1; if (ret != 0) { @@ -138,7 +138,7 @@ std::string AdminSocket::destroy_shutdown_pipe() // Close read end. Doing this before join() blocks the listenter and prevents // joining. - retry_sys_call(close, m_shutdown_rd_fd); + retry_sys_call(::close, m_shutdown_rd_fd); m_shutdown_rd_fd = -1; return ""; @@ -168,7 +168,7 @@ std::string AdminSocket::bind_and_listen(const std::string &sock_path, int *fd) int r = fcntl(sock_fd, F_SETFD, FD_CLOEXEC); if (r < 0) { r = errno; - retry_sys_call(&::close, sock_fd); + retry_sys_call(::close, sock_fd); ostringstream oss; oss << "AdminSocket::bind_and_listen: failed to fcntl on socket: " << cpp_strerror(r); return oss.str(); @@ -189,7 +189,7 @@ std::string AdminSocket::bind_and_listen(const std::string &sock_path, int *fd) err = EEXIST; } else { ldout(m_cct, 20) << "unlink stale file " << sock_path << dendl; - retry_sys_call(&::unlink, sock_path.c_str()); + retry_sys_call(::unlink, sock_path.c_str()); if (::bind(sock_fd, (struct sockaddr*)&address, sizeof(struct sockaddr_un)) == 0) { err = 0; @@ -213,7 +213,7 @@ std::string AdminSocket::bind_and_listen(const std::string &sock_path, int *fd) oss << "AdminSocket::bind_and_listen: " << "failed to listen to socket: " << cpp_strerror(err); close(sock_fd); - retry_sys_call(&::unlink, sock_path.c_str()); + retry_sys_call(::unlink, sock_path.c_str()); return oss.str(); } *fd = sock_fd; @@ -303,7 +303,7 @@ bool AdminSocket::do_accept() lderr(m_cct) << "AdminSocket: error reading request code: " << cpp_strerror(ret) << dendl; } - retry_sys_call(&::close, connection_fd); + retry_sys_call(::close, connection_fd); return false; } if (cmd[0] == '\0') { @@ -335,7 +335,7 @@ bool AdminSocket::do_accept() } if (++pos >= sizeof(cmd)) { lderr(m_cct) << "AdminSocket: error reading request too long" << dendl; - retry_sys_call(&::close, connection_fd); + retry_sys_call(::close, connection_fd); return false; } } @@ -349,7 +349,7 @@ bool AdminSocket::do_accept() cmdvec.push_back(cmd); if (!cmdmap_from_json(cmdvec, &cmdmap, errss)) { ldout(m_cct, 0) << "AdminSocket: " << errss.str() << dendl; - retry_sys_call(&::close, connection_fd); + retry_sys_call(::close, connection_fd); return false; } cmd_getval(m_cct, cmdmap, "format", format); @@ -419,7 +419,7 @@ bool AdminSocket::do_accept() } l.unlock(); - retry_sys_call(&::close, connection_fd); + retry_sys_call(::close, connection_fd); return rval; } @@ -621,7 +621,7 @@ void AdminSocket::shutdown() lderr(m_cct) << "AdminSocket::shutdown: error: " << err << dendl; } - retry_sys_call(&::close, m_sock_fd); + retry_sys_call(::close, m_sock_fd); unregister_command("version"); unregister_command("git_version"); -- 2.39.5