From 362433559f9bb0c11df24fa2503e065f16371739 Mon Sep 17 00:00:00 2001 From: Hao Lee <1838249551@qq.com> Date: Fri, 26 May 2023 14:45:42 +0800 Subject: [PATCH] style:format codes remove redundant extern g_pika_conf statement and correct if statement judgement instead of assignment Signed-off-by: Hao Lee <1838249551@qq.com> --- src/net/include/thread_pool.h | 5 ----- src/net/src/client_thread.cc | 2 +- src/pika_admin.cc | 1 - src/pika_stable_log.cc | 1 - 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/net/include/thread_pool.h b/src/net/include/thread_pool.h index 466df487d0..c9e6928a31 100644 --- a/src/net/include/thread_pool.h +++ b/src/net/include/thread_pool.h @@ -65,11 +65,6 @@ class ThreadPool : public pstd::noncopyable { void cur_time_queue_size(size_t* qsize); std::string thread_pool_name(); - /* - * No allowed copy and copy assign - */ - ThreadPool(const ThreadPool&); - void operator=(const ThreadPool&); private: void runInThread(); diff --git a/src/net/src/client_thread.cc b/src/net/src/client_thread.cc index 3f1d7a3015..f51080d793 100644 --- a/src/net/src/client_thread.cc +++ b/src/net/src/client_thread.cc @@ -142,7 +142,7 @@ Status ClientThread::ScheduleConnect(const std::string& dst_ip, int dst_port) { hints.ai_socktype = SOCK_STREAM; // We do not handle IPv6 - if (rv = getaddrinfo(dst_ip.c_str(), cport, &hints, &servinfo)) { + if (rv = getaddrinfo(dst_ip.c_str(), cport, &hints, &servinfo); rv) { return Status::IOError("connect getaddrinfo error for ", dst_ip); } for (p = servinfo; p != nullptr; p = p->ai_next) { diff --git a/src/pika_admin.cc b/src/pika_admin.cc index 0694443a61..f33bdda1f3 100644 --- a/src/pika_admin.cc +++ b/src/pika_admin.cc @@ -22,7 +22,6 @@ using pstd::Status; extern PikaServer* g_pika_server; -extern std::unique_ptr g_pika_conf; extern std::unique_ptr g_pika_rm; static std::string ConstructPinginPubSubResp(const PikaCmdArgsType& argv) { diff --git a/src/pika_stable_log.cc b/src/pika_stable_log.cc index 17c871b9c4..1c51babe9c 100644 --- a/src/pika_stable_log.cc +++ b/src/pika_stable_log.cc @@ -18,7 +18,6 @@ using pstd::Status; -extern std::unique_ptr g_pika_conf; extern PikaServer* g_pika_server; extern std::unique_ptr g_pika_rm;