From: Andre Noll <maan@systemlinux.org>
Date: Mon, 3 Dec 2007 18:46:25 +0000 (+0100)
Subject: Trivial whitespace cleanups.
X-Git-Tag: v0.3.0~72
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=24e2b57dde50a6fe33deee034d34181eece09834;hp=7a0852896a75d852dbd2ac848ec5c0be3b5dea71

Trivial whitespace cleanups.
---

diff --git a/http_send.c b/http_send.c
index 799c06cc..8cce85a1 100644
--- a/http_send.c
+++ b/http_send.c
@@ -87,8 +87,8 @@ static struct sender *self;
 
 static void http_shutdown_client(struct http_client *hc, const char *msg)
 {
-	PARA_INFO_LOG("shutting down %s on fd %d (%s)\n",
-		      hc->name, hc->fd, msg);
+	PARA_INFO_LOG("shutting down %s on fd %d (%s)\n", hc->name, hc->fd,
+		msg);
 	numclients--;
 	free(hc->name);
 	close(hc->fd);
@@ -291,14 +291,14 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
 	hc->cq = cq_new(MAX_BACKLOG);
 	numclients++;
 	PARA_INFO_LOG("accepted client #%d: %s (fd %d)\n", numclients,
-		      hc->name, hc->fd);
+		hc->name, hc->fd);
 	para_list_add(&hc->node, &clients);
 	add_close_on_fork_list(hc->fd);
 	mark_fd_nonblocking(hc->fd);
 	return;
 err_out:
 	PARA_WARNING_LOG("ignoring connect request from %s (%s)\n",
-			 hc->name, err_msg);
+		hc->name, err_msg);
 	if (hc->fd > 0)
 		close(hc->fd);
 	free(hc);
@@ -435,8 +435,7 @@ static char *http_info(void)
 		ap = tmp;
 	}
 	list_for_each_entry_safe(hc, tmp_hc, &clients, node) {
-		char *tmp = make_message("%s%s ", clnts? clnts : "",
-					 hc->name);
+		char *tmp = make_message("%s%s ", clnts? clnts : "", hc->name);
 		free(clnts);
 		clnts = tmp;
 	}
diff --git a/net.c b/net.c
index 076600fc..9c03ca08 100644
--- a/net.c
+++ b/net.c
@@ -138,7 +138,7 @@ static const char *layer4_name(const unsigned l4type)
  *  \sa ipv6(7), getaddrinfo(3), bind(2), connect(2)
  */
 int makesock(unsigned l3type, unsigned l4type, int passive,
-	     const char *host, unsigned short port_number)
+		const char *host, unsigned short port_number)
 {
 	struct addrinfo *local = NULL, *src,
 			*remote = NULL, *dst, hints;
@@ -180,7 +180,7 @@ int makesock(unsigned l3type, unsigned l4type, int passive,
 	 */
 	for (src = local, dst = remote; src != NULL || dst != NULL; /* no op */ ) {
 		if (src && dst && src->ai_family == AF_INET
-			       && dst->ai_family == AF_INET6)	/* v4 -> v6 is not possible */
+				&& dst->ai_family == AF_INET6)	/* v4 -> v6 is not possible */
 			goto get_next_dst;
 
 		sockfd = socket(src ? src->ai_family : dst->ai_family, socktype, l4type);
@@ -248,7 +248,7 @@ int para_listen(unsigned l3type, unsigned l4type, unsigned short port)
 			return -ERRNO_TO_PARA_ERROR(errno);
 		}
 		PARA_INFO_LOG("listening on %s port %u, fd %d\n",
-			      layer4_name(l4type), port, fd);
+			layer4_name(l4type), port, fd);
 	}
 	return fd;
 }
@@ -268,7 +268,7 @@ char *host_and_port(struct sockaddr *sa, socklen_t len)
 	int		ret;
 
 	ret = getnameinfo(sa, len, hbuf, sizeof(hbuf), sbuf, sizeof(sbuf),
-			  NI_NUMERICHOST | NI_NUMERICSERV);
+		NI_NUMERICHOST | NI_NUMERICSERV);
 	if (ret)	{
 		PARA_WARNING_LOG("hostname lookup error (%s).\n", gai_strerror(ret));
 		sprintf(output, "(unknown)");