From 925ac2b7baab2545b665059a8f53ee616efe2805 Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Thu, 10 Sep 2009 23:10:07 +0200
Subject: [PATCH] read_tcp: get rid of heavy indenting

---
 src/conky.c | 54 ++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/conky.c b/src/conky.c
index e2fbbc97..ac45890a 100644
--- a/src/conky.c
+++ b/src/conky.c
@@ -1020,35 +1020,35 @@ static void generate_text_internal(char *p, int p_max_size,
 			OBJ(read_tcp) {
 				int sock, received;
 				struct sockaddr_in addr;
-				struct hostent* he = gethostbyname(obj->data.read_tcp.host);
-				if(he != NULL) {
-					sock = socket(he->h_addrtype, SOCK_STREAM, 0);
-					if(sock != -1) {
-						memset(&addr, 0, sizeof(addr));
-						addr.sin_family = AF_INET;
-						addr.sin_port = obj->data.read_tcp.port;
-						memcpy(&addr.sin_addr, he->h_addr, he->h_length);
-						if (connect(sock, (struct sockaddr*)&addr, sizeof(struct sockaddr)) == 0) {
-							fd_set readfds;
-							struct timeval tv;
-							FD_ZERO(&readfds);
-							FD_SET(sock, &readfds);
-							tv.tv_sec = 1;
-							tv.tv_usec = 0;
-							if(select(sock + 1, &readfds, NULL, NULL, &tv) > 0){
-								received = recv(sock, p, p_max_size, 0);
-								p[received] = 0;
-							}
-							close(sock);
-						} else {
-							NORM_ERR("read_tcp: Couldn't create a connection");
-						}
-					}else{
-						NORM_ERR("read_tcp: Couldn't create a socket");
-					}
-				}else{
+				struct hostent* he;
+				fd_set readfds;
+				struct timeval tv;
+
+				if (!(he = gethostbyname(obj->data.read_tcp.host))) {
 					NORM_ERR("read_tcp: Problem with resolving the hostname");
+					break;
 				}
+				if ((sock = socket(he->h_addrtype, SOCK_STREAM, 0)) == -1) {
+					NORM_ERR("read_tcp: Couldn't create a socket");
+					break;
+				}
+				memset(&addr, 0, sizeof(addr));
+				addr.sin_family = AF_INET;
+				addr.sin_port = obj->data.read_tcp.port;
+				memcpy(&addr.sin_addr, he->h_addr, he->h_length);
+				if (!connect(sock, (struct sockaddr*)&addr, sizeof(struct sockaddr))) {
+					NORM_ERR("read_tcp: Couldn't create a connection");
+					break;
+				}
+				FD_ZERO(&readfds);
+				FD_SET(sock, &readfds);
+				tv.tv_sec = 1;
+				tv.tv_usec = 0;
+				if(select(sock + 1, &readfds, NULL, NULL, &tv) > 0){
+					received = recv(sock, p, p_max_size, 0);
+					p[received] = 0;
+				}
+				close(sock);
 			}
 #ifndef __OpenBSD__
 			OBJ(acpitemp) {