Merge pull request #6 from ForestLH/style/clang

style:format codes
ForestLH · May 26, 2023 · cb7238a · cb7238a
2 parents 6bc870c + 3624335
commit cb7238a
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 8 deletions.
diff --git 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
@@ -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
@@ -22,7 +22,6 @@
 using pstd::Status;
 
 extern PikaServer* g_pika_server;
-extern std::unique_ptr<PikaConf> g_pika_conf;
 extern std::unique_ptr<PikaReplicaManager> g_pika_rm;
 
 static std::string ConstructPinginPubSubResp(const PikaCmdArgsType& argv) {

diff --git a/src/pika_stable_log.cc b/src/pika_stable_log.cc
@@ -18,7 +18,6 @@
 
 using pstd::Status;
 
-extern std::unique_ptr<PikaConf> g_pika_conf;
 extern PikaServer* g_pika_server;
 extern std::unique_ptr<PikaReplicaManager> g_pika_rm;