Mercurial > masqmail

changeset 289:bb3005ce0837

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reformating of code
author markus schnalke <meillo@marmaro.de>
date Wed, 08 Dec 2010 17:17:38 -0300 (2010-12-08)
parents 84ea0b1fc8f8
children 792e0201c1b3
files src/accept.c
diffstat 1 files changed, 17 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/accept.c	Tue Dec 07 19:21:44 2010 -0300
+++ b/src/accept.c	Wed Dec 08 17:17:38 2010 -0300
@@ -367,23 +367,29 @@
 		for_string = g_strdup_printf(" for %s", addr_string(addr));
 	}
 
-	if (msg->received_host == NULL) {
+	if (!msg->received_host) {
 		/* received locally */
-		hdr = create_header(HEAD_RECEIVED, "Received: from %s by %s with %s (%s %s) id %s%s; %s\n",
-		                    passwd->pw_name, conf.host_name, prot_names[msg->received_prot],
-		                    PACKAGE, VERSION, msg->uid, for_string ? for_string : "", rec_timestamp());
+		hdr = create_header(HEAD_RECEIVED,
+		    "Received: from %s by %s with %s (%s %s) id %s%s; %s\n",
+		    passwd->pw_name, conf.host_name,
+		    prot_names[msg->received_prot], PACKAGE, VERSION,
+		    msg->uid, for_string ? for_string : "", rec_timestamp());
 	} else {
 		/* received from remote */
 #ifdef ENABLE_IDENT
 		DEBUG(5) debugf("adding 'Received:' header (5)\n");
-		hdr = create_header(HEAD_RECEIVED, "Received: from %s (ident=%s) by %s with %s (%s %s) id %s%s; %s\n",
-		                    msg->received_host, msg->ident ? msg->ident : "unknown", conf.host_name,
-		                    prot_names[msg->received_prot], PACKAGE, VERSION, msg->uid, for_string ? for_string : "",
-		                    rec_timestamp());
+		hdr = create_header(HEAD_RECEIVED,
+		    "Received: from %s (ident=%s) by %s with %s (%s %s) id %s%s; %s\n",
+		    msg->received_host, msg->ident ? msg->ident : "unknown",
+		    conf.host_name, prot_names[msg->received_prot], PACKAGE,
+		    VERSION, msg->uid, for_string ? for_string : "",
+		    rec_timestamp());
 #else
-		hdr = create_header(HEAD_RECEIVED, "Received: from %s by %s with %s (%s %s) id %s%s; %s\n",
-		                    msg->received_host, conf.host_name, prot_names[msg->received_prot],
-		                    PACKAGE, VERSION, msg->uid, for_string ? for_string : "", rec_timestamp());
+		hdr = create_header(HEAD_RECEIVED,
+		    "Received: from %s by %s with %s (%s %s) id %s%s; %s\n",
+		    msg->received_host, conf.host_name,
+		    prot_names[msg->received_prot], PACKAGE, VERSION,
+		    msg->uid, for_string ? for_string : "", rec_timestamp());
 #endif
 	}
 	header_fold(hdr);