From ae02b7a8a50a65d89bbe69792f20e45720e9f65f Mon Sep 17 00:00:00 2001
From: Kaijie Gu <2459548460@qq.com>
Date: Tue, 27 Aug 2024 21:15:19 +0800
Subject: [PATCH] fix error and make some modify

---
 src/client_map.cc |  4 ++--
 src/client_map.h  |  6 +++---
 src/cmd_admin.cc  | 13 ++++++-------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/client_map.cc b/src/client_map.cc
index 1231991..9cc672b 100644
--- a/src/client_map.cc
+++ b/src/client_map.cc
@@ -1,7 +1,7 @@
 #include "client_map.h"
 #include "log.h"
 
-namespace pikiwidb {
+namespace kiwi {
 
 uint32_t ClientMap::GetAllClientInfos(std::vector<ClientInfo>& results) {
   // client info string type: ip, port, fd.
@@ -100,4 +100,4 @@ bool ClientMap::KillClientById(int client_id) {
   return false;
 }
 
-}  // namespace pikiwidb
\ No newline at end of file
+}  // namespace kiwi
\ No newline at end of file
diff --git a/src/client_map.h b/src/client_map.h
index aba1e4e..ddbfa23 100644
--- a/src/client_map.h
+++ b/src/client_map.h
@@ -6,7 +6,7 @@
 #include <string>
 #include "client.h"
 
-namespace pikiwidb {
+namespace kiwi {
 class ClientMap {
  private:
   ClientMap() = default;
@@ -26,7 +26,7 @@ class ClientMap {
   ClientMap& operator=(const ClientMap&) = delete;
 
   // client info function
-  pikiwidb::ClientInfo GetClientsInfoById(int id);
+  kiwi::ClientInfo GetClientsInfoById(int id);
   uint32_t GetAllClientInfos(std::vector<ClientInfo>& results);
 
   bool AddClient(int id, std::weak_ptr<PClient>);
@@ -38,4 +38,4 @@ class ClientMap {
   bool KillClientByAddrPort(const std::string& addr_port);
 };
 
-}  // namespace pikiwidb
\ No newline at end of file
+}  // namespace kiwi
\ No newline at end of file
diff --git a/src/cmd_admin.cc b/src/cmd_admin.cc
index 9e9e9bc..9754606 100644
--- a/src/cmd_admin.cc
+++ b/src/cmd_admin.cc
@@ -662,7 +662,7 @@ CmdClientSetname::CmdClientSetname(const std::string& name, int16_t arity)
 
 bool CmdClientSetname::DoInitial(PClient* client) { return true; }
 
-void pikiwidb::CmdClientSetname::DoCmd(PClient* client) {
+void kiwi::CmdClientSetname::DoCmd(PClient* client) {
   client->SetName(client->argv_[2]);
   client->SetRes(CmdRes::kOK);
 }
@@ -695,7 +695,7 @@ bool CmdClientKill::DoInitial(PClient* client) {
 
 void CmdClientKill::DoCmd(PClient* client) {
   bool ret;
-  auto& client_map = pikiwidb::ClientMap::getInstance();
+  auto& client_map = kiwi::ClientMap::getInstance();
   switch (kill_type_) {
     case Type::ALL: {
       ret = client_map.KillAllClients();
@@ -740,7 +740,7 @@ void CmdClientList::DoCmd(PClient* client) {
   auto& client_map = ClientMap::getInstance();
   switch (list_type_) {
     case Type::DEFAULT: {
-      std::vector<pikiwidb::ClientInfo> client_infos;
+      std::vector<kiwi::ClientInfo> client_infos;
       client_map.GetAllClientInfos(client_infos);
       client->AppendArrayLen(client_infos.size());
       if (client_infos.size() == 0) {
@@ -766,10 +766,9 @@ void CmdClientList::DoCmd(PClient* client) {
             client->SetRes(CmdRes::kErrOther, "Invalid client id");
             return;
           }
-          char buf[128];
-          snprintf(buf, sizeof(buf), "ID=%ld IP=%s PORT=%d\n", client_info.client_id, client_info.ip.c_str(),
-                   client_info.port);
-          client->AppendString(std::string(buf));
+          std::string result =
+              fmt::format("ID={} IP={} PORT={}\n", client_info.client_id, client_info.ip, client_info.port);
+          client->AppendString(result);
         } catch (const std::exception& e) {
           client->SetRes(CmdRes::kErrOther, "Invalid client id");
           return;