formatting

src/lib/utils/tcpsocket.cpp

@@ -35,10 +35,7 @@ TCPSocket::TCPSocket(int sfd, struct sockaddr_in* address) : m_sfd(sfd)
 
 bool TCPSocket::isValid()
 {
-	if (fcntl(m_sfd, F_GETFL) == -1)
-		return false;
-	else
-		return true;
+	return fcntl(m_sfd, F_GETFL) != -1;
 }
 
 
@@ -53,37 +50,37 @@ TCPSocket* TCPClient::connect(const string& server, const uint16_t& port)
 		struct hostent* he;
 
 		he = gethostbyname(server.c_str());
-		if (he == NULL)
+		if (he == NULL) {
 			return NULL;
-
+		}
 		memcpy(&address.sin_addr, he->h_addr_list[0], he->h_length);
-	}
-	else {
+	} else {
 		ret = inet_aton(server.c_str(), &address.sin_addr);
-		if (ret == 0)
+		if (ret == 0) {
 			return NULL;
+		}
 	}
 
 	address.sin_family = AF_INET;
 	address.sin_port = (in_port_t)htons(port);
 
 	int sfd = socket(AF_INET, SOCK_STREAM, 0);
-	if (sfd < 0)
+	if (sfd < 0) {
 		return NULL;
-
+	}
 	ret = ::connect(sfd, (struct sockaddr*) &address, sizeof(address));
-	if (ret < 0)
+	if (ret < 0) {
 		return NULL;
-
+	}
 	return new TCPSocket(sfd, &address);
 }
 
 
 int TCPServer::start()
 {
-	if (m_listening)
+	if (m_listening) {
 		return 0;
-
+	}
 	m_lfd = socket(AF_INET, SOCK_STREAM, 0);
 	struct sockaddr_in address;
 
@@ -92,40 +89,40 @@ int TCPServer::start()
 	address.sin_family = AF_INET;
 	address.sin_port = (in_port_t)htons(m_port);
 
-	if (m_address.size() > 0)
+	if (m_address.size() > 0) {
 		inet_pton(AF_INET, m_address.c_str(), &(address.sin_addr));
-	else
+	} else {
 		address.sin_addr.s_addr = INADDR_ANY;
-
+	}
 	int optval = 1;
 	setsockopt(m_lfd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval));
 
 	int result = bind(m_lfd, (struct sockaddr*) &address, sizeof(address));
-	if (result != 0)
+	if (result != 0) {
 		return result;
-
+	}
 	result = listen(m_lfd, 5);
-	if (result != 0)
+	if (result != 0) {
 		return result;
-
+	}
 	m_listening = true;
 	return result;
 }
 
 TCPSocket* TCPServer::newSocket()
 {
-	if (!m_listening)
+	if (!m_listening) {
 		return NULL;
-
+	}
 	struct sockaddr_in address;
 	socklen_t len = sizeof(address);
 
 	memset(&address, 0, sizeof(address));
 
 	int sfd = accept(m_lfd, (struct sockaddr*) &address, &len);
-	if (sfd < 0)
+	if (sfd < 0) {
 		return NULL;
-
+	}
 	return new TCPSocket(sfd, &address);
 }