From 7cf8cc7567ab612b55f150c6bb4f71395256084a Mon Sep 17 00:00:00 2001
From: yang li <li.10.yang@nokia.com>
Date: Wed, 9 Jan 2019 16:22:34 +0800
Subject: [PATCH] Trim codes.

---
 examples/client/client.cpp           | 31 ++++-----------------
 examples/echo_server/echo_server.cpp | 41 ++++++++--------------------
 2 files changed, 17 insertions(+), 55 deletions(-)

diff --git a/examples/client/client.cpp b/examples/client/client.cpp
index 5f69fb0..60b44cd 100644
--- a/examples/client/client.cpp
+++ b/examples/client/client.cpp
@@ -90,24 +90,13 @@ private:
 class short_client : public multi_client_base<short_connection>, protected i_controller
 {
 public:
-	short_client(service_pump& service_pump_) : multi_client_base<short_connection>(service_pump_) {}
-
-	void set_server_addr(unsigned short _port, const std::string& _ip = ASCS_SERVER_IP)
-	{
-		port = _port;
-		ip = _ip;
-	}
+	short_client(service_pump& service_pump_) : multi_client_base(service_pump_) {}
 
+	void set_server_addr(unsigned short _port, const std::string& _ip = ASCS_SERVER_IP) {port = _port; ip = _ip;}
 	bool send_msg(const std::string& msg)
 	{
 		auto socket_ptr = add_socket(port, ip);
-		if (socket_ptr)
-		{
-			socket_ptr->set_controller(this);
-			return socket_ptr->send_msg(msg);
-		}
-
-		return false;
+		return socket_ptr ? socket_ptr->set_controller(this), socket_ptr->send_msg(msg) : false;
 	}
 
 protected:
@@ -151,22 +140,14 @@ int main(int argc, const char* argv[])
 //	argv[2] = "::1" //ipv6
 //	argv[2] = "127.0.0.1" //ipv4
 	unsigned short port = ASCS_SERVER_PORT + 100;
-	std::string ip;
+	std::string ip = ASCS_SERVER_IP;
 	if (argc > 1)
 		port = (unsigned short) atoi(argv[1]);
 	if (argc > 2)
 		ip = argv[2];
 
-	if (!ip.empty())
-	{
-		client.set_server_addr(port, ip);
-		client2.set_server_addr(port + 1, ip);
-	}
-	else
-	{
-		client.set_server_addr(port);
-		client2.set_server_addr(port + 1);
-	}
+	client.set_server_addr(port, ip);
+	client2.set_server_addr(port + 1, ip);
 
 	sp.start_service();
 	auto t = create_sync_recv_thread(client);
diff --git a/examples/echo_server/echo_server.cpp b/examples/echo_server/echo_server.cpp
index 51d5572..63e8b71 100644
--- a/examples/echo_server/echo_server.cpp
+++ b/examples/echo_server/echo_server.cpp
@@ -185,24 +185,12 @@ protected:
 	//msg handling
 #ifdef ASCS_SYNC_DISPATCH
 	//do not hold msg_can for further using, return from on_msg as quickly as possible
-	virtual size_t on_msg(std::list<out_msg_type>& msg_can)
-	{
-		auto re = server_socket_base::on_msg(msg_can);
-		force_shutdown();
-
-		return re;
-	}
+	virtual size_t on_msg(std::list<out_msg_type>& msg_can) {auto re = server_socket_base::on_msg(msg_can); force_shutdown(); return re;}
 #endif
 
 #ifdef ASCS_DISPATCH_BATCH_MSG
 	//do not hold msg_can for further using, access msg_can and return from on_msg_handle as quickly as possible
-	virtual size_t on_msg_handle(out_queue_type& msg_can)
-	{
-		auto re = server_socket_base::on_msg_handle(msg_can);
-		force_shutdown();
-
-		return re;
-	}
+	virtual size_t on_msg_handle(out_queue_type& msg_can) {auto re = server_socket_base::on_msg_handle(msg_can); force_shutdown(); return re;}
 #else
 	virtual bool on_msg_handle(out_msg_type& msg) {auto re = server_socket_base::on_msg_handle(msg); force_shutdown(); return re;}
 #endif
@@ -227,23 +215,16 @@ int main(int argc, const char* argv[])
 	server_base<short_connection> short_server(sp);
 	echo_server echo_server_(sp); //echo server
 
+	unsigned short port = ASCS_SERVER_PORT;
+	std::string ip;
+	if (argc > 2)
+		port = (unsigned short) atoi(argv[2]);
 	if (argc > 3)
-	{
-		normal_server.set_server_addr(atoi(argv[2]) + 100, argv[3]);
-		short_server.set_server_addr(atoi(argv[2]) + 101, argv[3]);
-		echo_server_.set_server_addr(atoi(argv[2]), argv[3]);
-	}
-	else if (argc > 2)
-	{
-		normal_server.set_server_addr(atoi(argv[2]) + 100);
-		short_server.set_server_addr(atoi(argv[2]) + 101);
-		echo_server_.set_server_addr(atoi(argv[2]));
-	}
-	else
-	{
-		normal_server.set_server_addr(ASCS_SERVER_PORT + 100);
-		short_server.set_server_addr(ASCS_SERVER_PORT + 101);
-	}
+		ip = argv[3];
+
+	normal_server.set_server_addr(port + 100, ip);
+	short_server.set_server_addr(port + 101, ip);
+	echo_server_.set_server_addr(port, ip);
 
 	auto thread_num = 1;
 	if (argc > 1)
-- 
GitLab