modify client close interface.

wlgq2 · May 6, 2020 · f2da6b1 · f2da6b1
1 parent 0742f8b
commit f2da6b1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/examples/echo_client/main.cpp b/examples/echo_client/main.cpp
@@ -31,7 +31,7 @@ void startClients(uv::EventLoop* loop,uv::SocketAddr& addr,std::vector<uv::TcpCl
         });
         client->setMessageCallback([client](const char* data,ssize_t size)
         {
-            client->write(data,size,nullptr);
+            client->write(data,(unsigned)size,nullptr);
         });
 
         client->connect(addr);

diff --git a/uv/TcpClient.cpp b/uv/TcpClient.cpp
@@ -108,22 +108,21 @@ void TcpClient::onMessage(shared_ptr<TcpConnection> connection,const char* buf,s
         onMessageCallback_(buf,size);
 }
 
-void uv::TcpClient::close(std::function<void(std::string&)> callback)
+void uv::TcpClient::close(std::function<void(uv::TcpClient*)> callback)
 {
     if (connection_)
     {
-        connection_->close([this, callback](std::string& name)
+        connection_->close([this, callback](std::string&)
         {
             //onClose(name);
             if (callback)
-                callback(name);
+                callback(this);
         });
 
     }
     else if(callback)
     {
-        std::string str("");
-        callback(str);
+        callback(this);
     }
 }
 

diff --git a/uv/http/HttpClient.cpp b/uv/http/HttpClient.cpp
@@ -25,8 +25,7 @@ HttpClient::~HttpClient()
 {
     if (isConnected)
     {
-        auto client = client_;
-        client->close([client](std::string& name)
+        client_->close([](uv::TcpClient* client)
         {
             delete client;
         });

diff --git a/uv/include/TcpClient.h b/uv/include/TcpClient.h
@@ -43,7 +43,7 @@ class TcpClient
     void onConnect(bool successed);
     void onConnectClose(std::string& name);
     void onMessage(TcpConnectionPtr connection,const char* buf,ssize_t size);
-    void close(std::function<void(std::string&)> callback);
+    void close(std::function<void(uv::TcpClient*)> callback);
     void afterConnectFail();
 
     void write(const char* buf, unsigned int size, AfterWriteCallback callback = nullptr);