--- a/src/route.c	Mon Oct 27 16:21:27 2008 +0100
+++ b/src/route.c	Mon Oct 27 16:23:10 2008 +0100
@@ -19,347 +19,335 @@
 #include "masqmail.h"
 #include <fnmatch.h>
 
-msgout_perhost *create_msgout_perhost(gchar *host)
+msgout_perhost*
+create_msgout_perhost(gchar * host)
 {
-  msgout_perhost *mo_ph = g_malloc(sizeof(msgout_perhost));
-  if(mo_ph){
-    mo_ph->host = g_strdup(host);
-    mo_ph->msgout_list = NULL;
-  }
-  return mo_ph;
+	msgout_perhost *mo_ph = g_malloc(sizeof(msgout_perhost));
+	if (mo_ph) {
+		mo_ph->host = g_strdup(host);
+		mo_ph->msgout_list = NULL;
+	}
+	return mo_ph;
 }
 
-void destroy_msgout_perhost(msgout_perhost *mo_ph)
+void
+destroy_msgout_perhost(msgout_perhost * mo_ph)
 {
-  GList *mo_node;
+	GList *mo_node;
 
-  foreach(mo_ph->msgout_list, mo_node){
-    msg_out *mo = (msg_out *)(mo_node->data);
-    /* the rcpt_list is owned by the msgout's,
-       but not the rcpt's themselves */
-    g_list_free(mo->rcpt_list);
-    g_free(mo);
-  }
-  g_list_free(mo_ph->msgout_list);
-  g_free(mo_ph);
+	foreach(mo_ph->msgout_list, mo_node) {
+		msg_out *mo = (msg_out *) (mo_node->data);
+		/* the rcpt_list is owned by the msgout's, but not the rcpt's themselves */
+		g_list_free(mo->rcpt_list);
+		g_free(mo);
+	}
+	g_list_free(mo_ph->msgout_list);
+	g_free(mo_ph);
 }
 
-void rewrite_headers(msg_out *msgout, connect_route *route)
+void
+rewrite_headers(msg_out * msgout, connect_route * route)
 {
-  /* if set_h_from_domain is set, replace domain in all
-     From: headers.
-  */
-  msgout->hdr_list = g_list_copy(msgout->msg->hdr_list);
+	/* if set_h_from_domain is set, replace domain in all
+	   From: headers.
+	 */
+	msgout->hdr_list = g_list_copy(msgout->msg->hdr_list);
+
+	/* map from addresses */
+	if (route->map_h_from_addresses != NULL) {
+		GList *hdr_node;
+		foreach(msgout->hdr_list, hdr_node) {
+			header *hdr = (header *) (hdr_node->data);
+			if (hdr->id == HEAD_FROM) {
+				header *new_hdr = copy_header(hdr);
+				if (map_address_header(new_hdr, route->map_h_from_addresses)) {
+					hdr_node->data = new_hdr;
+					/* we need this list only to carefully free the extra headers: */
+					msgout->xtra_hdr_list = g_list_append(msgout->xtra_hdr_list, new_hdr);
+				} else
+					g_free(new_hdr);
+			}
+		}
+	} else {
+		/* replace from domain */
+		if (route->set_h_from_domain != NULL) {
+			GList *hdr_node;
+
+			foreach(msgout->hdr_list, hdr_node) {
+				header *hdr = (header *) (hdr_node->data);
+				if (hdr->id == HEAD_FROM) {
+					header *new_hdr = copy_header(hdr);
 
-  /* map from addresses */
-  if(route->map_h_from_addresses != NULL){
-    GList *hdr_node;
-    foreach(msgout->hdr_list, hdr_node){
-      header *hdr = (header *)(hdr_node->data);
-      if(hdr->id == HEAD_FROM){
-	header *new_hdr = copy_header(hdr);
-	if(map_address_header(new_hdr, route->map_h_from_addresses)){
-	  hdr_node->data = new_hdr;
-	  /* we need this list only to carefully free the extra headers: */
-	  msgout->xtra_hdr_list =
-	    g_list_append(msgout->xtra_hdr_list, new_hdr);
-	}else
-	  g_free(new_hdr);
-      }
-    }
-  }else{
-    /* replace from domain */
-    if(route->set_h_from_domain != NULL){
-      GList *hdr_node;
-      
-      foreach(msgout->hdr_list, hdr_node){
-	header *hdr = (header *)(hdr_node->data);
-	if(hdr->id == HEAD_FROM){
-	  header *new_hdr = copy_header(hdr);
-	  
-	  DEBUG(5) debugf("setting From: domain to %s\n",
-			  route->set_h_from_domain);
-	  if(set_address_header_domain(new_hdr, route->set_h_from_domain)){
-	    hdr_node->data = new_hdr;
-	    /* we need this list only to carefully free the extra headers: */
-	    DEBUG(6) debugf("header = %s\n",
-			    new_hdr->header);
-	    msgout->xtra_hdr_list = g_list_append(msgout->xtra_hdr_list, new_hdr);
-	  }else{
-	    logwrite(LOG_ALERT, "error in set_address_header_domain(%s, %s)\n",
-		     new_hdr->value, route->set_h_from_domain);
-	  }
+					DEBUG(5) debugf("setting From: domain to %s\n", route->set_h_from_domain);
+					if (set_address_header_domain(new_hdr, route->set_h_from_domain)) {
+						hdr_node->data = new_hdr;
+						/* we need this list only to carefully free the extra headers: */
+						DEBUG(6) debugf("header = %s\n", new_hdr->header);
+						msgout->xtra_hdr_list = g_list_append(msgout->xtra_hdr_list, new_hdr);
+					} else {
+						logwrite(LOG_ALERT, "error in set_address_header_domain(%s, %s)\n", new_hdr->value, route->set_h_from_domain);
+					}
+				}
+			}
+		}
 	}
-      }
-    }
-  }
+
+	/* map reply-to addresses */
+	if (route->map_h_reply_to_addresses != NULL) {
+		GList *hdr_node;
+		foreach(msgout->hdr_list, hdr_node) {
+			header *hdr = (header *) (hdr_node->data);
+			if (hdr->id == HEAD_REPLY_TO) {
+				header *new_hdr = copy_header(hdr);
+				if (map_address_header
+					(new_hdr, route->map_h_reply_to_addresses)) {
+					hdr_node->data = new_hdr;
+					/* we need this list only to carefully free the extra headers: */
+					msgout->xtra_hdr_list = g_list_append(msgout->xtra_hdr_list, new_hdr);
+				} else
+					g_free(new_hdr);
+			}
+		}
+	} else {
+		/* replace Reply-to domain */
+		if (route->set_h_reply_to_domain != NULL) {
+			GList *hdr_node;
 
-  /* map reply-to addresses */
-  if(route->map_h_reply_to_addresses != NULL){
-    GList *hdr_node;
-    foreach(msgout->hdr_list, hdr_node){
-      header *hdr = (header *)(hdr_node->data);
-      if(hdr->id == HEAD_REPLY_TO){
-	header *new_hdr = copy_header(hdr);
-	if(map_address_header(new_hdr, route->map_h_reply_to_addresses)){
-	  hdr_node->data = new_hdr;
-	  /* we need this list only to carefully free the extra headers: */
-	  msgout->xtra_hdr_list =
-	    g_list_append(msgout->xtra_hdr_list, new_hdr);
-	}else
-	  g_free(new_hdr);
-      }
-    }
-  }else{
-    /* replace Reply-to domain */
-    if(route->set_h_reply_to_domain != NULL){
-      GList *hdr_node;
-      
-      foreach(msgout->hdr_list, hdr_node){
-	header *hdr = (header *)(hdr_node->data);
-	if(hdr->id == HEAD_REPLY_TO){
-	  header *new_hdr = copy_header(hdr);
-	  
-	  set_address_header_domain(new_hdr, route->set_h_reply_to_domain);
-	  hdr_node->data = new_hdr;
-	  /* we need this list only to carefully free the extra headers: */
-	  msgout->xtra_hdr_list = g_list_append(msgout->xtra_hdr_list, new_hdr);
+			foreach(msgout->hdr_list, hdr_node) {
+				header *hdr = (header *) (hdr_node->data);
+				if (hdr->id == HEAD_REPLY_TO) {
+					header *new_hdr = copy_header(hdr);
+
+					set_address_header_domain(new_hdr, route-> set_h_reply_to_domain);
+					hdr_node->data = new_hdr;
+					/* we need this list only to carefully free the extra headers: */
+					msgout->xtra_hdr_list = g_list_append(msgout->xtra_hdr_list, new_hdr);
+				}
+			}
+		}
 	}
-      }
-    }
-  }
+
+	/* map Mail-Followup-To addresses */
+	if (route->map_h_mail_followup_to_addresses != NULL) {
+		GList *hdr_node;
+		foreach(msgout->hdr_list, hdr_node) {
+			header *hdr = (header *) (hdr_node->data);
+			if (strncasecmp(hdr->header, "Mail-Followup-To", 16) == 0) {
+				header *new_hdr = copy_header(hdr);
+				if (map_address_header(new_hdr, route->map_h_mail_followup_to_addresses)) {
+					hdr_node->data = new_hdr;
+					/* we need this list only to carefully free the extra headers: */
+					msgout->xtra_hdr_list = g_list_append(msgout->xtra_hdr_list, new_hdr);
+				} else
+					g_free(new_hdr);
+			}
+		}
+	}
+
+	/* set Sender: domain to return_path->domain */
+	if (route->expand_h_sender_domain) {
+		GList *hdr_node;
 
-  /* map Mail-Followup-To addresses */
-  if(route->map_h_mail_followup_to_addresses != NULL){
-    GList *hdr_node;
-    foreach(msgout->hdr_list, hdr_node){
-      header *hdr = (header *)(hdr_node->data);
-      if(strncasecmp(hdr->header, "Mail-Followup-To", 16) == 0){
-	header *new_hdr = copy_header(hdr);
-	if(map_address_header(new_hdr, route->map_h_mail_followup_to_addresses)){
-	  hdr_node->data = new_hdr;
-	  /* we need this list only to carefully free the extra headers: */
-	  msgout->xtra_hdr_list =
-	    g_list_append(msgout->xtra_hdr_list, new_hdr);
-	}else
-	  g_free(new_hdr);
-      }
-    }
-  }
+		foreach(msgout->hdr_list, hdr_node) {
+			header *hdr = (header *) (hdr_node->data);
+			if (hdr->id == HEAD_SENDER) {
+				header *new_hdr = copy_header(hdr);
 
-  /* set Sender: domain to return_path->domain */
-  if(route->expand_h_sender_domain){
-    GList *hdr_node;
+				set_address_header_domain(new_hdr, msgout->return_path->domain);
+				hdr_node->data = new_hdr;
+				/* we need this list only to carefully free the extra headers: */
+				msgout->xtra_hdr_list = g_list_append(msgout->xtra_hdr_list, new_hdr);
+			}
+		}
+	}
 
-    foreach(msgout->hdr_list, hdr_node){
-      header *hdr = (header *)(hdr_node->data);
-      if(hdr->id == HEAD_SENDER){
-	header *new_hdr = copy_header(hdr);
+	/* set Sender: domain to return_path->domain */
+	if (route->expand_h_sender_address) {
+		GList *hdr_node;
 
-	set_address_header_domain(new_hdr, msgout->return_path->domain);
-	hdr_node->data = new_hdr;
-	/* we need this list only to carefully free the extra headers: */
-	msgout->xtra_hdr_list = g_list_append(msgout->xtra_hdr_list, new_hdr);
-      }
-    }
-  }
-
-  /* set Sender: domain to return_path->domain */
-  if(route->expand_h_sender_address){
-    GList *hdr_node;
-
-    foreach(msgout->hdr_list, hdr_node){
-      header *hdr = (header *)(hdr_node->data);
-      if(hdr->id == HEAD_SENDER){
-	header *new_hdr;
+		foreach(msgout->hdr_list, hdr_node) {
+			header *hdr = (header *) (hdr_node->data);
+			if (hdr->id == HEAD_SENDER) {
+				header *new_hdr;
 
-	new_hdr =
-	  create_header(HEAD_SENDER, "Sender: %s@%s\n",
-			msgout->return_path->local_part, msgout->return_path->domain);
-	hdr_node->data = new_hdr;
-	/* we need this list only to carefully free the extra headers: */
-	msgout->xtra_hdr_list = g_list_append(msgout->xtra_hdr_list, new_hdr);
-      }
-    }
-  }
+				new_hdr = create_header(HEAD_SENDER, "Sender: %s@%s\n", msgout->return_path->local_part, msgout->return_path->domain);
+				hdr_node->data = new_hdr;
+				/* we need this list only to carefully free the extra headers: */
+				msgout->xtra_hdr_list = g_list_append(msgout->xtra_hdr_list, new_hdr);
+			}
+		}
+	}
 
-  if(msgout->xtra_hdr_list == NULL){
-    /* nothing was changed */
-    g_list_free(msgout->hdr_list);
-    msgout->hdr_list = NULL;
-  }
-  DEBUG(5) debugf("rewrite_headers() returning\n");
+	if (msgout->xtra_hdr_list == NULL) {
+		/* nothing was changed */
+		g_list_free(msgout->hdr_list);
+		msgout->hdr_list = NULL;
+	}
+	DEBUG(5) debugf("rewrite_headers() returning\n");
 }
 
-void rcptlist_with_one_of_hostlist(GList *rcpt_list, GList *host_list,
-				   GList **p_rcpt_list, GList **p_non_rcpt_list)
+void
+rcptlist_with_one_of_hostlist(GList * rcpt_list, GList * host_list, GList ** p_rcpt_list, GList ** p_non_rcpt_list)
 {
-  GList *rcpt_node;
+	GList *rcpt_node;
 
-  if(rcpt_list == NULL)
-    return;
+	if (rcpt_list == NULL)
+		return;
 
-  foreach(rcpt_list, rcpt_node){
-    address *rcpt = (address *)(rcpt_node->data);
-    GList *host_node = NULL;
+	foreach(rcpt_list, rcpt_node) {
+		address *rcpt = (address *) (rcpt_node->data);
+		GList *host_node = NULL;
 
-    foreach(host_list, host_node){
-      gchar *host = (gchar *)(host_node->data);
-      if(fnmatch(host, rcpt->domain, FNM_CASEFOLD) == 0)
-	break;
-    }
-    if(host_node){
-      if(p_rcpt_list)
-	*p_rcpt_list = g_list_append(*p_rcpt_list, rcpt);
-    }else{
-      if(p_non_rcpt_list)
-	*p_non_rcpt_list = g_list_append(*p_non_rcpt_list, rcpt);
-    }
+		foreach(host_list, host_node) {
+			gchar *host = (gchar *) (host_node->data);
+			if (fnmatch(host, rcpt->domain, FNM_CASEFOLD) == 0)
+				break;
+		}
+		if (host_node) {
+			if (p_rcpt_list)
+				*p_rcpt_list = g_list_append(*p_rcpt_list, rcpt);
+		} else {
+			if (p_non_rcpt_list)
+				*p_non_rcpt_list = g_list_append(*p_non_rcpt_list, rcpt);
+		}
 
-  }
+	}
 }
 
-void rcptlist_with_addr_is_local(GList *rcpt_list,
-				 GList **p_rcpt_list, GList **p_non_rcpt_list)
+void
+rcptlist_with_addr_is_local(GList * rcpt_list, GList ** p_rcpt_list, GList ** p_non_rcpt_list)
 {
-  GList *rcpt_node;
+	GList *rcpt_node;
 
-  if(rcpt_list == NULL)
-    return;
+	if (rcpt_list == NULL)
+		return;
 
-  foreach(rcpt_list, rcpt_node){
-    address *rcpt = (address *)(rcpt_node->data);
-    if(addr_is_local(rcpt)){
-      if(p_rcpt_list)
-	*p_rcpt_list = g_list_append(*p_rcpt_list, rcpt);
-    }else{
-      if(p_non_rcpt_list)
-	*p_non_rcpt_list = g_list_append(*p_non_rcpt_list, rcpt);
-    }
+	foreach(rcpt_list, rcpt_node) {
+		address *rcpt = (address *) (rcpt_node->data);
+		if (addr_is_local(rcpt)) {
+			if (p_rcpt_list)
+				*p_rcpt_list = g_list_append(*p_rcpt_list, rcpt);
+		} else {
+			if (p_non_rcpt_list)
+				*p_non_rcpt_list = g_list_append(*p_non_rcpt_list, rcpt);
+		}
 
-  }
+	}
 }
 
-static gint _g_list_addrcmp(gconstpointer a, gconstpointer b)
+static gint
+_g_list_addrcmp(gconstpointer a, gconstpointer b)
 {
-  return addr_match((address *)a, (address *)b);
+	return addr_match((address *) a, (address *) b);
 }
 
-gboolean route_is_allowed_return_path(connect_route *route, address *ret_path)
+gboolean
+route_is_allowed_return_path(connect_route * route, address * ret_path)
 {
-  if(route->not_allowed_return_paths != NULL){
-    if(g_list_find_custom(route->not_allowed_return_paths, ret_path,
-			  _g_list_addrcmp) != NULL){
-      return FALSE;
-    }
-  }
-  if(route->allowed_return_paths != NULL){
-    if(g_list_find_custom(route->allowed_return_paths, ret_path,
-			  _g_list_addrcmp) != NULL){
-      return TRUE;
-    }else{
-      return FALSE;
-    }
-  }
-  return TRUE;
+	if (route->not_allowed_return_paths != NULL) {
+		if (g_list_find_custom(route->not_allowed_return_paths, ret_path, _g_list_addrcmp) != NULL) {
+			return FALSE;
+		}
+	}
+	if (route->allowed_return_paths != NULL) {
+		if (g_list_find_custom(route->allowed_return_paths, ret_path, _g_list_addrcmp) != NULL) {
+			return TRUE;
+		} else {
+			return FALSE;
+		}
+	}
+	return TRUE;
 }
 
-static gint _g_list_strcmp(gconstpointer a, gconstpointer b)
+static gint
+_g_list_strcmp(gconstpointer a, gconstpointer b)
 {
-  return (gint)strcmp(a, b);
+	return (gint) strcmp(a, b);
 }
 
-gboolean route_is_allowed_mail_local(connect_route *route, address *ret_path)
+gboolean
+route_is_allowed_mail_local(connect_route * route, address * ret_path)
 {
-  gchar *loc_part = ret_path->local_part;
+	gchar *loc_part = ret_path->local_part;
 
-  if(route->not_allowed_mail_locals != NULL){
-    if(g_list_find_custom(route->not_allowed_mail_locals, loc_part,
-			 _g_list_strcmp) != NULL)
-      return FALSE;
-  }
-  if(route->allowed_mail_locals != NULL){
-    if(g_list_find_custom(route->allowed_mail_locals, loc_part,
-			  _g_list_strcmp) != NULL)
-      return TRUE;
-    else
-      return FALSE;
-  }
-  return TRUE;
+	if (route->not_allowed_mail_locals != NULL) {
+		if (g_list_find_custom(route->not_allowed_mail_locals, loc_part, _g_list_strcmp) != NULL)
+			return FALSE;
+	}
+	if (route->allowed_mail_locals != NULL) {
+		if (g_list_find_custom(route->allowed_mail_locals, loc_part, _g_list_strcmp) != NULL)
+			return TRUE;
+		else
+			return FALSE;
+	}
+	return TRUE;
 }
 
-/* 
+/*
    Make lists of matching/not matching rcpts.
    Local domains are NOT regared here, these should be sorted out previously
 */
-void msg_rcptlist_route(connect_route *route, GList *rcpt_list,
-			GList **p_rcpt_list, GList **p_non_rcpt_list)
+void
+msg_rcptlist_route(connect_route * route, GList * rcpt_list, GList ** p_rcpt_list, GList ** p_non_rcpt_list)
 {
-  GList *tmp_list = NULL;
-  /* sort out those domains that can be sent over this connection: */
-  if(route->allowed_rcpt_domains){
-    DEBUG(5) debugf("testing for route->allowed_rcpt_domains\n");
-    rcptlist_with_one_of_hostlist(rcpt_list, route->allowed_rcpt_domains, &tmp_list, p_non_rcpt_list);
-  }else{
-    DEBUG(5) debugf("route->allowed_rcpt_domains == NULL\n");
-    tmp_list = g_list_copy(rcpt_list);
-  }
+	GList *tmp_list = NULL;
+	/* sort out those domains that can be sent over this connection: */
+	if (route->allowed_rcpt_domains) {
+		DEBUG(5) debugf("testing for route->allowed_rcpt_domains\n");
+		rcptlist_with_one_of_hostlist(rcpt_list, route->allowed_rcpt_domains, &tmp_list, p_non_rcpt_list);
+	} else {
+		DEBUG(5) debugf("route->allowed_rcpt_domains == NULL\n");
+		tmp_list = g_list_copy(rcpt_list);
+	}
 
-  /* sort out those domains that cannot be sent over this connection: */
-  rcptlist_with_one_of_hostlist(tmp_list, route->not_allowed_rcpt_domains, p_non_rcpt_list, p_rcpt_list);
-  g_list_free(tmp_list);
+	/* sort out those domains that cannot be sent over this connection: */
+	rcptlist_with_one_of_hostlist(tmp_list, route->not_allowed_rcpt_domains, p_non_rcpt_list, p_rcpt_list);
+	g_list_free(tmp_list);
 }
 
-msg_out *route_prepare_msgout(connect_route *route, msg_out *msgout)
+msg_out*
+route_prepare_msgout(connect_route * route, msg_out * msgout)
 {
-  message *msg = msgout->msg;
-  GList *rcpt_list = msgout->rcpt_list;
+	message *msg = msgout->msg;
+	GList *rcpt_list = msgout->rcpt_list;
+
+	if (rcpt_list != NULL) {
+		/* found a few */
+		DEBUG(5) {
+			GList *node;
+			debugf("rcpts for routed delivery, route = %s, id = %s\n", route->name, msg->uid);
+			foreach(rcpt_list, node) {
+				address *rcpt = (address *) (node->data);
+				debugf("rcpt for routed delivery: <%s@%s>\n", rcpt->local_part, rcpt->domain);
+			}
+		}
 
-  if(rcpt_list != NULL){
-    /* found a few */
-    DEBUG(5){
-      GList *node;
-      debugf("rcpts for routed delivery, route = %s, id = %s\n", route->name, msg->uid);
-      foreach(rcpt_list, node){
-	address *rcpt = (address *)(node->data);
-	debugf("rcpt for routed delivery: <%s@%s>\n",
-	       rcpt->local_part, rcpt->domain);
-      }
-    }
-      
-    /* rewrite return path
-       if there is a table, use that
-       if an address is found and if it has a domain, use that
-    */
-    if(route->map_return_path_addresses){
-      address *ret_path = NULL;
-      DEBUG(5) debugf("looking up %s in map_return_path_addresses\n",
-		      msg->return_path->local_part);
-      ret_path =
-	(address *)table_find_fnmatch(route->map_return_path_addresses,
-			      msg->return_path->local_part);
-      if(ret_path){
-	DEBUG(5) debugf("found <%s@%s>\n",
-			ret_path->local_part, ret_path->domain); 
-	if(ret_path->domain == NULL)
-	  ret_path->domain =
-	    route->set_return_path_domain ?
-	    route->set_return_path_domain : msg->return_path->domain;
-	msgout->return_path = copy_address(ret_path);
-      }
-    }
-    if(msgout->return_path == NULL){
-      DEBUG(5) debugf("setting return path to %s\n",
-		      route->set_return_path_domain);
-      msgout->return_path =
-	copy_modify_address(msg->return_path,
-			    NULL, route->set_return_path_domain);
-    }
-    rewrite_headers(msgout, route);
+		/* rewrite return path
+		   if there is a table, use that
+		   if an address is found and if it has a domain, use that
+		 */
+		if (route->map_return_path_addresses) {
+			address *ret_path = NULL;
+			DEBUG(5) debugf("looking up %s in map_return_path_addresses\n", msg->return_path->local_part);
+			ret_path = (address *) table_find_fnmatch(route->map_return_path_addresses, msg->return_path->local_part);
+			if (ret_path) {
+				DEBUG(5) debugf("found <%s@%s>\n", ret_path->local_part, ret_path->domain);
+				if (ret_path->domain == NULL)
+					ret_path->domain = route->set_return_path_domain
+					                   ? route->set_return_path_domain
+					                   : msg->return_path->domain;
+				msgout->return_path = copy_address(ret_path);
+			}
+		}
+		if (msgout->return_path == NULL) {
+			DEBUG(5) debugf("setting return path to %s\n", route->set_return_path_domain);
+			msgout->return_path = copy_modify_address(msg->return_path, NULL, route->set_return_path_domain);
+		}
+		rewrite_headers(msgout, route);
 
-    return msgout;
-  }
-  return NULL;
+		return msgout;
+	}
+	return NULL;
 }
 
 /* put msgout's is msgout_list into bins (msgout_perhost structs) for each
@@ -367,70 +355,66 @@
    route param is not used, we leave it here because that may change.
  */
 
-GList *route_msgout_list(connect_route *route, GList *msgout_list)
+GList*
+route_msgout_list(connect_route * route, GList * msgout_list)
 {
-  GList *mo_ph_list = NULL;
-  GList *msgout_node;
+	GList *mo_ph_list = NULL;
+	GList *msgout_node;
 
-  foreach(msgout_list, msgout_node){
-    msg_out *msgout = (msg_out *)(msgout_node->data);
-    msg_out *msgout_new;
-    GList *rcpt_list = msgout->rcpt_list;
-    GList *rcpt_node;
+	foreach(msgout_list, msgout_node) {
+		msg_out *msgout = (msg_out *) (msgout_node->data);
+		msg_out *msgout_new;
+		GList *rcpt_list = msgout->rcpt_list;
+		GList *rcpt_node;
 
-    foreach(rcpt_list, rcpt_node){
-      address *rcpt = rcpt_node->data;
-      msgout_perhost *mo_ph = NULL;
-      GList *mo_ph_node = NULL;
+		foreach(rcpt_list, rcpt_node) {
+			address *rcpt = rcpt_node->data;
+			msgout_perhost *mo_ph = NULL;
+			GList *mo_ph_node = NULL;
 
-      /* search host in mo_ph_list */
-      foreach(mo_ph_list, mo_ph_node){
-	mo_ph = (msgout_perhost *)(mo_ph_node->data);
-	if(strcasecmp(mo_ph->host, rcpt->domain) == 0)
-	  break;
-      }
-      if(mo_ph_node != NULL){
-	/* there is already a rcpt for this host */
-	msg_out *msgout_last =
-	  (msg_out *)((g_list_last(mo_ph->msgout_list))->data);
-	if(msgout_last->msg == msgout->msg){
-	  /* if it is also the same message, it must be the last one
-	     appended to mo_ph->msgout_list (since outer loop goes through
-	     msgout_list) */
-	  msgout_last->rcpt_list =
-	    g_list_append(msgout_last->rcpt_list, rcpt);
-	}else{
-	  /* if not, we append a new msgout */
-	  /* make a copy of msgout */
-	  msgout_new = create_msg_out(msgout->msg);
-	  msgout_new->return_path = msgout->return_path;
-	  msgout_new->hdr_list = msgout->hdr_list;
+			/* search host in mo_ph_list */
+			foreach(mo_ph_list, mo_ph_node) {
+				mo_ph = (msgout_perhost *) (mo_ph_node->data);
+				if (strcasecmp(mo_ph->host, rcpt->domain) == 0)
+					break;
+			}
+			if (mo_ph_node != NULL) {
+				/* there is already a rcpt for this host */
+				msg_out *msgout_last = (msg_out *) ((g_list_last(mo_ph->msgout_list))->data);
+				if (msgout_last->msg == msgout->msg) {
+					/* if it is also the same message, it must be the last one
+					   appended to mo_ph->msgout_list (since outer loop goes through
+					   msgout_list) */
+					msgout_last->rcpt_list = g_list_append(msgout_last->rcpt_list, rcpt);
+				} else {
+					/* if not, we append a new msgout */
+					/* make a copy of msgout */
+					msgout_new = create_msg_out(msgout->msg);
+					msgout_new->return_path = msgout->return_path;
+					msgout_new->hdr_list = msgout->hdr_list;
 
-	  /* append our rcpt to it */
-	  /* It is the 1st rcpt for this msg to this host,
-	     therefore we safely give NULL */
-	  msgout_new->rcpt_list = g_list_append(NULL, rcpt);
-	  mo_ph->msgout_list =
-	    g_list_append(mo_ph->msgout_list, msgout_new);
-	}
-      }else{
-	/* this rcpt to goes to another host */
-	mo_ph = create_msgout_perhost(rcpt->domain);
-	mo_ph_list = g_list_append(mo_ph_list, mo_ph);
+					/* append our rcpt to it */
+					/* It is the 1st rcpt for this msg to this host, therefore we safely give NULL */
+					msgout_new->rcpt_list = g_list_append(NULL, rcpt);
+					mo_ph->msgout_list = g_list_append(mo_ph->msgout_list, msgout_new);
+				}
+			} else {
+				/* this rcpt to goes to another host */
+				mo_ph = create_msgout_perhost(rcpt->domain);
+				mo_ph_list = g_list_append(mo_ph_list, mo_ph);
 
-	/* make a copy of msgout */
-	msgout_new = create_msg_out(msgout->msg);
-	msgout_new->return_path = msgout->return_path;
-	msgout_new->hdr_list = msgout->hdr_list;
-	    
-	/* append our rcpt to it */
-	/* It is the 1st rcpt for this msg to this host,
-	   therefore we safely give NULL */
-	msgout_new->rcpt_list = g_list_append(NULL, rcpt);
-	mo_ph->msgout_list = g_list_append(mo_ph->msgout_list, msgout_new);
-      }/* if mo_ph != NULL */
-    }/* foreach(rcpt_list, ... */
-  }/* foreach(msgout_list, ... */
+				/* make a copy of msgout */
+				msgout_new = create_msg_out(msgout->msg);
+				msgout_new->return_path = msgout->return_path;
+				msgout_new->hdr_list = msgout->hdr_list;
 
-  return mo_ph_list;
+				/* append our rcpt to it */
+				/* It is the 1st rcpt for this msg to this host, therefore we safely give NULL */
+				msgout_new->rcpt_list = g_list_append(NULL, rcpt);
+				mo_ph->msgout_list = g_list_append(mo_ph->msgout_list, msgout_new);
+			}  /* if mo_ph != NULL */
+		}  /* foreach(rcpt_list, ... */
+	}  /* foreach(msgout_list, ... */
+
+	return mo_ph_list;
 }