# HG changeset patch
# User markus schnalke <meillo@marmaro.de>
# Date 1316696860 -7200
# Node ID 41958685480d041e72b757982c55488b0eff3115
# Parent  934a223e4ee8668091e60c78669926341c576833
Switched to `type *name' style
Andrew Koenig's ``C Traps and Pitfalls'' (Ch.2.1) convinced
me that it is best to go with the way C had been designed.
The ``declaration reflects use'' concept conflicts with a
``type* name'' notation. Hence I switched.

diff -r 934a223e4ee8 -r 41958685480d src/accept.c
--- a/src/accept.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/accept.c	Thu Sep 22 15:07:40 2011 +0200
@@ -29,7 +29,7 @@
 };
 
 static gchar*
-string_base62(gchar * res, guint value, gchar len)
+string_base62(gchar *res, guint value, gchar len)
 {
 	static gchar base62_chars[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 	gchar *p = res + len;
@@ -62,7 +62,7 @@
 */
 
 accept_error
-accept_message_stream(FILE * in, message * msg, guint flags)
+accept_message_stream(FILE *in, message *msg, guint flags)
 {
 	gchar *line, *line1;
 	int line_size = MAX_DATALINE;
@@ -131,7 +131,7 @@
 			if (line1[0] == ' ' || line1[0] == '\t') {
 				/* continuation of 'folded' header: */
 				if (hdr) {
-					char* cp;
+					char *cp;
 					cp = g_strconcat(hdr->header, line1, NULL);
 					hdr->value = cp + (hdr->value - hdr->header);
 					free(hdr->header);
@@ -186,7 +186,7 @@
 }
 
 accept_error
-accept_message_prepare(message * msg, guint flags)
+accept_message_prepare(message *msg, guint flags)
 {
 	struct passwd *passwd = NULL;
 	time_t rec_time = time(NULL);
@@ -399,7 +399,7 @@
 }
 
 accept_error
-accept_message(FILE * in, message * msg, guint flags)
+accept_message(FILE *in, message *msg, guint flags)
 {
 	accept_error err;
 
diff -r 934a223e4ee8 -r 41958685480d src/address.c
--- a/src/address.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/address.c	Thu Sep 22 15:07:40 2011 +0200
@@ -19,7 +19,7 @@
 #include "masqmail.h"
 
 address*
-create_address(gchar * path, gboolean is_rfc821)
+create_address(gchar *path, gboolean is_rfc821)
 {
 	address *addr;
 	addr = _create_address(path, NULL, is_rfc821);
@@ -31,7 +31,7 @@
 }
 
 address*
-create_address_qualified(gchar * path, gboolean is_rfc821, gchar * domain)
+create_address_qualified(gchar *path, gboolean is_rfc821, gchar *domain)
 {
 	address *addr = create_address(path, is_rfc821);
 
@@ -43,7 +43,7 @@
 
 /* nothing special about pipes here, but its only called for that purpose */
 address*
-create_address_pipe(gchar * path)
+create_address_pipe(gchar *path)
 {
 	address *addr = g_malloc(sizeof(address));
 
@@ -58,7 +58,7 @@
 }
 
 void
-destroy_address(address * addr)
+destroy_address(address *addr)
 {
 	DEBUG(6) debugf("destroy_address entered\n");
 
@@ -70,7 +70,7 @@
 }
 
 address*
-copy_modify_address(const address * orig, gchar * l_part, gchar * dom)
+copy_modify_address(const address *orig, gchar *l_part, gchar *dom)
 {
 	address *addr = NULL;
 
@@ -101,7 +101,7 @@
 }
 
 gboolean
-addr_isequal(address * addr1, address * addr2, int (*cmpfunc) (const char*, const char*))
+addr_isequal(address *addr1, address *addr2, int (*cmpfunc) (const char*, const char*))
 {
 	return (cmpfunc(addr1->local_part, addr2->local_part) == 0)
 	       && (strcasecmp(addr1->domain, addr2->domain) == 0);
@@ -109,7 +109,7 @@
 
 /* searches in ancestors of addr1 */
 gboolean
-addr_isequal_parent(address* addr1, address* addr2, int (*cmpfunc) (const char*, const char*))
+addr_isequal_parent(address *addr1, address *addr2, int (*cmpfunc) (const char*, const char*))
 {
 	address *addr;
 
@@ -123,7 +123,7 @@
 /* careful, this is recursive */
 /* returns TRUE if ALL children have been delivered */
 gboolean
-addr_is_delivered_children(address * addr)
+addr_is_delivered_children(address *addr)
 {
 	GList *addr_node;
 
@@ -141,7 +141,7 @@
 /* careful, this is recursive */
 /* returns TRUE if ALL children have been either delivered or have failed */
 gboolean
-addr_is_finished_children(address * addr)
+addr_is_finished_children(address *addr)
 {
 	GList *addr_node;
 
@@ -158,7 +158,7 @@
 
 /* find original address */
 address*
-addr_find_ancestor(address * addr)
+addr_find_ancestor(address *addr)
 {
 	while (addr->parent)
 		addr = addr->parent;
@@ -166,7 +166,7 @@
 }
 
 gchar*
-addr_string(address * addr)
+addr_string(address *addr)
 {
 	static gchar *buffer = NULL;
 
diff -r 934a223e4ee8 -r 41958685480d src/alias.c
--- a/src/alias.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/alias.c	Thu Sep 22 15:07:40 2011 +0200
@@ -21,7 +21,7 @@
 #include <fnmatch.h>
 
 gboolean
-addr_is_local(address * addr)
+addr_is_local(address *addr)
 {
 	GList *dom_node;
 	GList *addr_node;
@@ -65,7 +65,7 @@
 }
 
 static GList*
-parse_list(gchar * line)
+parse_list(gchar *line)
 {
 	GList *list = NULL;
 	gchar buf[256];
@@ -107,14 +107,14 @@
 addr is assumed to be local and no pipe address nor not-to-expand
 */
 static GList*
-expand_one(GList* alias_table, address* addr)
+expand_one(GList *alias_table, address *addr)
 {
 	GList *val_list;
 	GList *val_node;
 	GList *alias_list = NULL;
 	GList *alias_node;
 	gchar *val;
-	address* alias_addr;
+	address *alias_addr;
 
 	/* expand the local alias */
 	DEBUG(6) debugf("alias: '%s' is local and will get expanded\n", addr->local_part);
@@ -198,7 +198,7 @@
 }
 
 GList*
-alias_expand(GList* alias_table, GList* rcpt_list, GList* non_rcpt_list)
+alias_expand(GList *alias_table, GList *rcpt_list, GList *non_rcpt_list)
 {
 	GList *rcpt_node = NULL;
 	GList *alias_list = NULL;
diff -r 934a223e4ee8 -r 41958685480d src/base64/base64.c
--- a/src/base64/base64.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/base64/base64.c	Thu Sep 22 15:07:40 2011 +0200
@@ -22,7 +22,7 @@
 #include "base64.h"
 
 gchar*
-base64_encode(guchar * buf, gint len)
+base64_encode(guchar *buf, gint len)
 {
 	guchar *outbuf, *q;
 	gchar enc[64];
@@ -74,7 +74,7 @@
 	return outbuf;
 }
 
-gchar *base64_decode(gchar * buf, gint * size)
+gchar *base64_decode(gchar *buf, gint *size)
 {
 	guchar *p = buf, *q;
 	guint in[4];
diff -r 934a223e4ee8 -r 41958685480d src/base64/base64.h
--- a/src/base64/base64.h	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/base64/base64.h	Thu Sep 22 15:07:40 2011 +0200
@@ -15,5 +15,5 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-gchar *base64_encode(guchar * buf, gint len);
-gchar *base64_decode(gchar * buf, gint * size);
+gchar *base64_encode(guchar *buf, gint len);
+gchar *base64_decode(gchar *buf, gint *size);
diff -r 934a223e4ee8 -r 41958685480d src/conf.c
--- a/src/conf.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/conf.c	Thu Sep 22 15:07:40 2011 +0200
@@ -49,7 +49,7 @@
 	}
 }
 
-static gchar* true_strings[] = {
+static gchar *true_strings[] = {
 	"yes", "on", "true", NULL
 };
 
@@ -58,7 +58,7 @@
 };
 
 static gboolean
-parse_boolean(gchar * rval)
+parse_boolean(gchar *rval)
 {
 	gchar **str;
 
@@ -84,7 +84,7 @@
 
 /* make a list from each line in a file */
 static GList*
-parse_list_file(gchar * fname)
+parse_list_file(gchar *fname)
 {
 	GList *list = NULL;
 	FILE *fptr;
@@ -111,7 +111,7 @@
 
 /* given a semicolon separated string, this function makes a GList out of it. */
 GList*
-parse_list(gchar * line, gboolean read_file)
+parse_list(gchar *line, gboolean read_file)
 {
 	GList *list = NULL;
 	gchar buf[256];
@@ -149,7 +149,7 @@
    We don't need valid RFC821 addresses here, just patterns to match against.
 */
 static GList*
-parse_address_glob_list(gchar * line, gboolean read_file)
+parse_address_glob_list(gchar *line, gboolean read_file)
 {
 	GList *plain_list = parse_list(line, read_file);
 	GList *node;
@@ -157,8 +157,8 @@
 
 	foreach(plain_list, node) {
 		gchar *item = (gchar *) (node->data);
-		char* at;
-		char* p;
+		char *at;
+		char *p;
 		address *addr = calloc(1, sizeof(address));
 
 		for (p=item+strlen(item)-1; isspace(*p) || *p=='>'; p--) {
@@ -188,7 +188,7 @@
 }
 
 static GList*
-parse_resolve_list(gchar * line)
+parse_resolve_list(gchar *line)
 {
 	GList *list;
 	GList *list_node;
@@ -220,7 +220,7 @@
 }
 
 static interface*
-parse_interface(gchar * line, gint def_port)
+parse_interface(gchar *line, gint def_port)
 {
 	gchar buf[256];
 	gchar *p, *q;
@@ -249,7 +249,7 @@
 
 #ifdef ENABLE_IDENT  /* so far used for that only */
 static struct in_addr*
-parse_network(gchar * line, gint def_port)
+parse_network(gchar *line, gint def_port)
 {
 	gchar buf[256];
 	gchar *p, *q;
@@ -292,7 +292,7 @@
 #endif
 
 static gboolean
-eat_comments(FILE * in)
+eat_comments(FILE *in)
 {
 	gint c;
 
@@ -311,7 +311,7 @@
 
 /* after parsing, eat trailing character until LF */
 static gboolean
-eat_line_trailing(FILE * in)
+eat_line_trailing(FILE *in)
 {
 	gint c;
 
@@ -322,7 +322,7 @@
 }
 
 static gboolean
-eat_spaces(FILE * in)
+eat_spaces(FILE *in)
 {
 	gint c;
 
@@ -336,7 +336,7 @@
 }
 
 static gboolean
-read_lval(FILE * in, gchar * buf, gint size)
+read_lval(FILE *in, gchar *buf, gint size)
 {
 	gint c;
 	gchar *ptr = buf;
@@ -373,7 +373,7 @@
 }
 
 static gboolean
-read_rval(FILE * in, gchar * buf, gint size)
+read_rval(FILE *in, gchar *buf, gint size)
 {
 	gint c;
 	gchar *ptr = buf;
@@ -421,7 +421,7 @@
 }
 
 static gboolean
-read_statement(FILE * in, gchar * lval, gint lsize, gchar * rval, gint rsize)
+read_statement(FILE *in, gchar *lval, gint lsize, gchar *rval, gint rsize)
 {
 	gint c;
 
@@ -449,7 +449,7 @@
 }
 
 gboolean
-read_conf(gchar * filename)
+read_conf(gchar *filename)
 {
 	FILE *in;
 
@@ -610,13 +610,13 @@
 		conf.warn_intervals = parse_list("1h;4h;8h;1d;2d;3d", FALSE);
 
 	if (!conf.local_hosts) {
-		char* shortname = strdup(conf.host_name);
-		char* p = strchr(shortname, '.');
+		char *shortname = strdup(conf.host_name);
+		char *p = strchr(shortname, '.');
 		if (p) {
 			*p = '\0';
 		}
 		/* we don't care if shortname and conf.host_name are the same */
-		char* local_hosts_str = g_strdup_printf("localhost;%s;%s", shortname, conf.host_name);
+		char *local_hosts_str = g_strdup_printf("localhost;%s;%s", shortname, conf.host_name);
 		conf.local_hosts = parse_list(local_hosts_str, FALSE);
 		free(shortname);
 		free(local_hosts_str);
@@ -627,7 +627,7 @@
 }
 
 connect_route*
-read_route(gchar * filename, gboolean is_perma)
+read_route(gchar *filename, gboolean is_perma)
 {
 	gboolean ok = FALSE;
 	FILE *in;
@@ -799,7 +799,7 @@
 }
 
 static void
-_g_list_free_all(GList * list)
+_g_list_free_all(GList *list)
 {
 	GList *node;
 	if (list) {
@@ -810,7 +810,7 @@
 }
 
 void
-destroy_route(connect_route * r)
+destroy_route(connect_route *r)
 {
 	if (r->filename)
 		g_free(r->filename);
@@ -850,7 +850,7 @@
 }
 
 GList*
-read_route_list(GList * rf_list, gboolean is_perma)
+read_route_list(GList *rf_list, gboolean is_perma)
 {
 	GList *list = NULL;
 	GList *node;
@@ -878,7 +878,7 @@
 }
 
 void
-destroy_route_list(GList * list)
+destroy_route_list(GList *list)
 {
 	GList *node;
 
diff -r 934a223e4ee8 -r 41958685480d src/connect.c
--- a/src/connect.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/connect.c	Thu Sep 22 15:07:40 2011 +0200
@@ -18,7 +18,7 @@
 #include "masqmail.h"
 
 static GList*
-resolve_ip(GList * list, gchar * ip)
+resolve_ip(GList *list, gchar *ip)
 {
 	struct in_addr ia;
 	if (inet_aton(ip, &ia)) {
@@ -34,7 +34,7 @@
 }
 
 mxip_addr*
-connect_hostlist(int *psockfd, gchar * host, guint port, GList * addr_list)
+connect_hostlist(int *psockfd, gchar *host, guint port, GList *addr_list)
 {
 	GList *addr_node;
 	struct sockaddr_in saddr;
@@ -86,7 +86,7 @@
 */
 
 mxip_addr*
-connect_resolvelist(int *psockfd, gchar * host, guint port, GList * res_func_list)
+connect_resolvelist(int *psockfd, gchar *host, guint port, GList *res_func_list)
 {
 	GList *res_node;
 	GList *addr_list;
diff -r 934a223e4ee8 -r 41958685480d src/deliver.c
--- a/src/deliver.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/deliver.c	Thu Sep 22 15:07:40 2011 +0200
@@ -27,7 +27,7 @@
 /* collect failed/defered rcpts for failure/warning messages */
 /* returns TRUE if either there are no failures or a failure message has been successfully sent */
 gboolean
-delivery_failures(message * msg, GList * rcpt_list, gchar * err_fmt, ...)
+delivery_failures(message *msg, GList *rcpt_list, gchar *err_fmt, ...)
 {
 	gboolean ok_fail = TRUE, ok_warn = TRUE;
 	time_t now = time(NULL);
@@ -69,7 +69,7 @@
 }
 
 gboolean
-deliver_local_mbox(message* msg, GList* hdr_list, address* rcpt, address* env_addr)
+deliver_local_mbox(message *msg, GList *hdr_list, address *rcpt, address *env_addr)
 {
 	DEBUG(1) debugf("attempting to deliver %s with mbox\n", msg->uid);
 	if (append_file(msg, hdr_list, rcpt->local_part)) {
@@ -92,7 +92,7 @@
 }
 
 gboolean
-deliver_local_pipe(message* msg, GList* hdr_list, address* rcpt, address* env_addr)
+deliver_local_pipe(message *msg, GList *hdr_list, address *rcpt, address *env_addr)
 {
 	guint flags;
 
@@ -117,7 +117,7 @@
 }
 
 gboolean
-deliver_local_mda(message* msg, GList* hdr_list, address* rcpt, address* env_addr)
+deliver_local_mda(message *msg, GList *hdr_list, address *rcpt, address *env_addr)
 {
 	gboolean ok = FALSE;
 	gchar *cmd = g_malloc(256);
@@ -151,7 +151,7 @@
 }
 
 gboolean
-deliver_local(msg_out * msgout)
+deliver_local(msg_out *msgout)
 {
 	message *msg = msgout->msg;
 	GList *rcpt_list = msgout->rcpt_list;
@@ -238,7 +238,7 @@
 /* make a list of rcpt's of a message that are local
    return a new copy of the list */
 void
-msg_rcptlist_local(GList * rcpt_list, GList ** p_local_list, GList ** p_nonlocal_list)
+msg_rcptlist_local(GList *rcpt_list, GList **p_local_list, GList **p_nonlocal_list)
 {
 	GList *rcpt_node;
 
@@ -262,7 +262,7 @@
 }
 
 gboolean
-deliver_msglist_host_pipe(connect_route * route, GList * msgout_list, gchar * host, GList * res_list)
+deliver_msglist_host_pipe(connect_route *route, GList *msgout_list, gchar *host, GList *res_list)
 {
 	gboolean ok = TRUE;
 	GList *msgout_node;
@@ -334,7 +334,7 @@
    Returns TRUE if at least one msg was delivered to at least one rcpt.
 */
 gboolean
-deliver_msglist_host_smtp(connect_route * route, GList * msgout_list, gchar * host, GList * res_list)
+deliver_msglist_host_smtp(connect_route *route, GList *msgout_list, gchar *host, GList *res_list)
 {
 	gboolean ok = FALSE;
 	GList *msgout_node;
@@ -464,7 +464,7 @@
 }
 
 gboolean
-deliver_msglist_host(connect_route * route, GList * msgout_list, gchar * host, GList * res_list)
+deliver_msglist_host(connect_route *route, GList *msgout_list, gchar *host, GList *res_list)
 {
 
 	if (route->pipe) {
@@ -480,7 +480,7 @@
   delivers messages in msgout_list using route
 */
 gboolean
-deliver_route_msgout_list(connect_route * route, GList * msgout_list)
+deliver_route_msgout_list(connect_route *route, GList *msgout_list)
 {
 	gboolean ok = FALSE;
 	GList *mo_ph_list;
@@ -522,7 +522,7 @@
   delivers messages in msg_list using route by calling deliver_route_msgout_list()
 */
 gboolean
-deliver_route_msg_list(connect_route * route, GList * msgout_list)
+deliver_route_msg_list(connect_route *route, GList *msgout_list)
 {
 	GList *msgout_list_deliver = NULL;
 	GList *msgout_node;
@@ -562,8 +562,8 @@
 		}
 
 		/* filter by allowed envelope rcpts */
-		GList* rcpt_list_allowed = NULL;
-		GList* rcpt_list_notallowed = NULL;
+		GList *rcpt_list_allowed = NULL;
+		GList *rcpt_list_notallowed = NULL;
 		route_split_rcpts(route, msgout_cloned->rcpt_list, &rcpt_list_allowed, &rcpt_list_notallowed);
 		if (!rcpt_list_allowed) {
 			destroy_msg_out(msgout_cloned);
@@ -600,7 +600,7 @@
    to make sure that they will not be delivered again.
 */
 void
-update_non_rcpt_list(msg_out * msgout)
+update_non_rcpt_list(msg_out *msgout)
 {
 	GList *rcpt_node;
 	message *msg = msgout->msg;
@@ -621,7 +621,7 @@
    returns TRUE if all went well.
 */
 gboolean
-deliver_finish(msg_out * msgout)
+deliver_finish(msg_out *msgout)
 {
 	GList *rcpt_node;
 	message *msg = msgout->msg;
@@ -668,7 +668,7 @@
 }
 
 int
-deliver_remote(GList* remote_msgout_list)
+deliver_remote(GList *remote_msgout_list)
 {
 	int ok = TRUE;
 	GList *route_list = NULL;
@@ -732,7 +732,7 @@
    into local and remote addresses and processes them accordingly.
 */
 gboolean
-deliver_msg_list(GList * msg_list, guint flags)
+deliver_msg_list(GList *msg_list, guint flags)
 {
 	GList *msgout_list = NULL;
 	GList *msg_node;
@@ -781,7 +781,7 @@
 			rcpt_list = aliased_rcpt_list;
 		}
 
-		/* split_rcpts(rcpt_list, NULL, &local_rcpt_list, * NULL, &other_rcpt_list); */
+		/* split_rcpts(rcpt_list, NULL, &local_rcpt_list, NULL, &other_rcpt_list); */
 		local_rcpt_list = local_rcpts(rcpt_list);
 		other_rcpt_list = remote_rcpts(rcpt_list);
 		g_list_free(rcpt_list);
@@ -845,7 +845,7 @@
    deliver then.
 */
 gboolean
-deliver(message * msg)
+deliver(message *msg)
 {
 	gboolean ok;
 	GList *msg_list = g_list_append(NULL, msg);
diff -r 934a223e4ee8 -r 41958685480d src/dotlock.c
--- a/src/dotlock.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/dotlock.c	Thu Sep 22 15:07:40 2011 +0200
@@ -30,7 +30,7 @@
 #include "dotlock.h"
 
 gboolean
-dot_lock(gchar * lock_name, gchar * hitch_name)
+dot_lock(gchar *lock_name, gchar *hitch_name)
 {
 	gboolean ok = FALSE;
 	int fd;
@@ -72,7 +72,7 @@
 }
 
 gboolean
-dot_unlock(gchar * lock_name)
+dot_unlock(gchar *lock_name)
 {
 	unlink(lock_name);
 
diff -r 934a223e4ee8 -r 41958685480d src/dotlock.h
--- a/src/dotlock.h	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/dotlock.h	Thu Sep 22 15:07:40 2011 +0200
@@ -18,5 +18,5 @@
 
 #define MAX_LOCKAGE 300
 
-gboolean dot_lock(gchar * lock_name, gchar * hitch_name);
-gboolean dot_unlock(gchar * lock_name);
+gboolean dot_lock(gchar *lock_name, gchar *hitch_name);
+gboolean dot_unlock(gchar *lock_name);
diff -r 934a223e4ee8 -r 41958685480d src/expand.c
--- a/src/expand.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/expand.c	Thu Sep 22 15:07:40 2011 +0200
@@ -21,7 +21,7 @@
 #define MAX_VAR 50
 
 GList*
-var_table_rcpt(GList * var_table, address * rcpt)
+var_table_rcpt(GList *var_table, address *rcpt)
 {
 	gchar *tmp_str;
 
@@ -36,7 +36,7 @@
 }
 
 GList*
-var_table_msg(GList * var_table, message * msg)
+var_table_msg(GList *var_table, message *msg)
 {
 	address *ret_path = msg->return_path;
 	gchar *tmp_str;
@@ -55,7 +55,7 @@
 }
 
 GList*
-var_table_conf(GList * var_table)
+var_table_conf(GList *var_table)
 {
 	var_table = g_list_prepend(var_table, create_pair_string("host_name", conf.host_name));
 	var_table = g_list_prepend(var_table, create_pair_string("package", PACKAGE));
@@ -65,7 +65,7 @@
 }
 
 gint
-expand(GList * var_list, gchar * format, gchar * result, gint result_len)
+expand(GList *var_list, gchar *format, gchar *result, gint result_len)
 {
 	gchar *p = format, *q = result;
 	gchar *vq;
diff -r 934a223e4ee8 -r 41958685480d src/fail_msg.c
--- a/src/fail_msg.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/fail_msg.c	Thu Sep 22 15:07:40 2011 +0200
@@ -23,7 +23,7 @@
 #include "readsock.h"
 
 gboolean
-fail_msg(message * msg, gchar * template, GList * failed_rcpts, gchar * err_fmt, va_list args)
+fail_msg(message *msg, gchar *template, GList *failed_rcpts, gchar *err_fmt, va_list args)
 {
 	gboolean ok = FALSE;
 	address *ret_path = NULL;
@@ -130,7 +130,7 @@
 */
 
 static gboolean
-warn_msg_is_due(message * msg)
+warn_msg_is_due(message *msg)
 {
 	time_t now = time(NULL);
 
@@ -155,7 +155,7 @@
 }
 
 gboolean
-warn_msg(message * msg, gchar * template, GList * defered_rcpts, gchar * err_fmt, va_list args)
+warn_msg(message *msg, gchar *template, GList *defered_rcpts, gchar *err_fmt, va_list args)
 {
 	time_t now = time(NULL);
 
diff -r 934a223e4ee8 -r 41958685480d src/header.c
--- a/src/header.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/header.c	Thu Sep 22 15:07:40 2011 +0200
@@ -71,7 +71,7 @@
    else finds all headers matching header
 */
 GList*
-find_header(GList * hdr_list, header_id id, gchar * hdr_str)
+find_header(GList *hdr_list, header_id id, gchar *hdr_str)
 {
 	GList *found_list = NULL;
 	GList *node;
@@ -103,7 +103,7 @@
 }
 
 void
-header_unfold(header * hdr)
+header_unfold(header *hdr)
 {
         char *src = hdr->header;
         char *dest = src;
@@ -133,13 +133,13 @@
    (We exclude the newline because the RFCs deal with it this way)
 */
 void
-header_fold(header* hdr, unsigned int maxlen)
+header_fold(header *hdr, unsigned int maxlen)
 {
 	int len = strlen(hdr->header);
-	char* src = hdr->header;
-	char* dest;
-	char* tmp;
-	char* p;
+	char *src = hdr->header;
+	char *dest;
+	char *tmp;
+	char *p;
 	int valueoffset;
 
 	if (len <= maxlen) {
@@ -209,7 +209,7 @@
 }
 
 header*
-create_header(header_id id, gchar * fmt, ...)
+create_header(header_id id, gchar *fmt, ...)
 {
 	gchar *p;
 	header *hdr;
@@ -242,7 +242,7 @@
 }
 
 void
-destroy_header(header * hdr)
+destroy_header(header *hdr)
 {
 	if (hdr) {
 		if (hdr->header) {
@@ -253,7 +253,7 @@
 }
 
 header*
-copy_header(header * hdr)
+copy_header(header *hdr)
 {
 	header *new_hdr = NULL;
 
@@ -267,7 +267,7 @@
 }
 
 header*
-get_header(gchar * line)
+get_header(gchar *line)
 {
 	gchar *p = line;
 	gchar buf[64], *q = buf;
diff -r 934a223e4ee8 -r 41958685480d src/interface.c
--- a/src/interface.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/interface.c	Thu Sep 22 15:07:40 2011 +0200
@@ -22,7 +22,7 @@
 /*#define SOCKADDR_OLD 1*/
 
 gboolean
-init_sockaddr(struct sockaddr_in * name, interface * iface)
+init_sockaddr(struct sockaddr_in *name, interface *iface)
 {
 	struct hostent *he;
 	struct in_addr ia;
@@ -66,7 +66,7 @@
 }
 
 int
-make_server_socket(interface * iface)
+make_server_socket(interface *iface)
 {
 	int sock = -1;
 	struct sockaddr_in server;
diff -r 934a223e4ee8 -r 41958685480d src/listen.c
--- a/src/listen.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/listen.c	Thu Sep 22 15:07:40 2011 +0200
@@ -93,7 +93,7 @@
 }
 
 void
-listen_port(GList * iface_list, gint qival, char *argv[])
+listen_port(GList *iface_list, gint qival, char *argv[])
 {
 	int i;
 	fd_set active_fd_set, read_fd_set;
diff -r 934a223e4ee8 -r 41958685480d src/local.c
--- a/src/local.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/local.c	Thu Sep 22 15:07:40 2011 +0200
@@ -24,7 +24,7 @@
 #include "peopen.h"
 
 static void
-message_stream(FILE * out, message * msg, GList * hdr_list, guint flags)
+message_stream(FILE *out, message *msg, GList *hdr_list, guint flags)
 {
 	time_t now = time(NULL);
 	GList *node;
@@ -50,7 +50,7 @@
 }
 
 gboolean
-append_file(message * msg, GList * hdr_list, gchar * user)
+append_file(message *msg, GList *hdr_list, gchar *user)
 {
 	struct passwd *pw;
 	gboolean ok = FALSE;
@@ -145,7 +145,7 @@
 }
 
 gboolean
-pipe_out(message * msg, GList * hdr_list, address * rcpt, gchar * cmd, guint flags)
+pipe_out(message *msg, GList *hdr_list, address *rcpt, gchar *cmd, guint flags)
 {
 	gchar *envp[40];
 	FILE *out;
diff -r 934a223e4ee8 -r 41958685480d src/lookup.c
--- a/src/lookup.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/lookup.c	Thu Sep 22 15:07:40 2011 +0200
@@ -122,7 +122,7 @@
 }
 
 static int
-dns_getip(guint32 * ip)
+dns_getip(guint32 *ip)
 {
 	int ret;
 
@@ -167,7 +167,7 @@
 }
 
 int
-dns_look_ip(gchar * domain, guint32 * ip)
+dns_look_ip(gchar *domain, guint32 *ip)
 {
 	gchar *n = domain;
 
@@ -203,7 +203,7 @@
 }
 
 GList*
-resolve_dns_a(GList * list, gchar * domain)
+resolve_dns_a(GList *list, gchar *domain)
 {
 	int ret;
 
@@ -235,7 +235,7 @@
 }
 
 GList*
-resolve_dns_mx(GList * list, gchar * domain)
+resolve_dns_mx(GList *list, gchar *domain)
 {
 	GList *node;
 	int ret;
@@ -286,7 +286,7 @@
 /* now something completely different... */
 
 GList*
-resolve_byname(GList * list, gchar * domain)
+resolve_byname(GList *list, gchar *domain)
 {
 	struct hostent *hent;
 
diff -r 934a223e4ee8 -r 41958685480d src/lookup.h
--- a/src/lookup.h	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/lookup.h	Thu Sep 22 15:07:40 2011 +0200
@@ -27,7 +27,7 @@
 
 typedef GList *(*resolve_func) (GList *, gchar *);
 
-GList *resolve_dns_a(GList * list, gchar * domain);
-GList *resolve_dns_mx(GList * list, gchar * domain);
-GList *resolve_byname(GList * list, gchar * domain);
-int dns_look_ip(gchar * domain, guint32 * ip);
+GList *resolve_dns_a(GList *list, gchar *domain);
+GList *resolve_dns_mx(GList *list, gchar *domain);
+GList *resolve_byname(GList *list, gchar *domain);
+int dns_look_ip(gchar *domain, guint32 *ip);
diff -r 934a223e4ee8 -r 41958685480d src/masqmail.c
--- a/src/masqmail.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/masqmail.c	Thu Sep 22 15:07:40 2011 +0200
@@ -76,7 +76,7 @@
 
 #ifdef ENABLE_IDENT  /* so far used for that only */
 static gboolean
-is_in_netlist(gchar * host, GList * netlist)
+is_in_netlist(gchar *host, GList *netlist)
 {
 	guint hostip = inet_addr(host);
 	struct in_addr addr;
@@ -102,7 +102,7 @@
              ^          ^
 */
 gchar*
-get_optarg(char* argv[], gint* argp, char* cp)
+get_optarg(char *argv[], gint *argp, char *cp)
 {
 	if (*cp) {
 		/* this kind: -xval */
@@ -118,7 +118,7 @@
 }
 
 gboolean
-write_pidfile(gchar * name)
+write_pidfile(gchar *name)
 {
 	FILE *fptr;
 
@@ -204,7 +204,7 @@
 
 /* default mode if address args or -t is specified, or called as rmail */
 static void
-mode_accept(address * return_path, gchar * full_sender_name, guint accept_flags, char **addresses, int addr_cnt)
+mode_accept(address *return_path, gchar *full_sender_name, guint accept_flags, char **addresses, int addr_cnt)
 {
 	/* accept message on stdin */
 	accept_error err;
@@ -312,7 +312,7 @@
 return success if at least one message had been deleted
 */
 static int
-manipulate_queue(char* cmd, char* id[])
+manipulate_queue(char *cmd, char *id[])
 {
 	gboolean ok = FALSE;
 
@@ -372,7 +372,7 @@
 
 /* -qo, -q (without argument), or called as runq */
 static int
-run_queue(gboolean do_runq, gboolean do_runq_online, char* route_name)
+run_queue(gboolean do_runq, gboolean do_runq_online, char *route_name)
 {
 	int ret;
 
@@ -431,7 +431,7 @@
 main(int argc, char *argv[])
 {
 	gchar *progname;
-	char* opt;
+	char *opt;
 	gint arg;
 
 	gboolean do_listen = FALSE;
diff -r 934a223e4ee8 -r 41958685480d src/masqmail.h
--- a/src/masqmail.h	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/masqmail.h	Thu Sep 22 15:07:40 2011 +0200
@@ -333,106 +333,106 @@
 } smtp_connection;
 
 /* alias.c*/
-gboolean addr_is_local(address * addr);
-GList *alias_expand(GList * alias_table, GList * rcpt_list, GList * non_rcpt_list);
+gboolean addr_is_local(address *addr);
+GList *alias_expand(GList *alias_table, GList *rcpt_list, GList *non_rcpt_list);
 
 /* child.c */
 int child(const char *command);
 
 /* conf.c */
 void init_conf();
-gboolean read_conf(gchar * filename);
-connect_route *read_route(gchar * filename, gboolean is_perma);
-GList *read_route_list(GList * rf_list, gboolean is_perma);
-void destroy_route(connect_route * r);
-void destroy_route_list(GList * list);
+gboolean read_conf(gchar *filename);
+connect_route *read_route(gchar *filename, gboolean is_perma);
+GList *read_route_list(GList *rf_list, gboolean is_perma);
+void destroy_route(connect_route *r);
+void destroy_route_list(GList *list);
 
 /* expand.c */
-GList *var_table_rcpt(GList * var_table, address * rcpt);
-GList *var_table_msg(GList * var_table, message * msg);
-GList *var_table_conf(GList * var_table);
-gint expand(GList * var_list, gchar * format, gchar * result, gint result_len);
+GList *var_table_rcpt(GList *var_table, address *rcpt);
+GList *var_table_msg(GList *var_table, message *msg);
+GList *var_table_conf(GList *var_table);
+gint expand(GList *var_list, gchar *format, gchar *result, gint result_len);
 
 /* message.c */
 message *create_message(void);
-void destroy_message(message * msg);
-void destroy_msg_list(GList * msg_list);
-void msg_free_data(message * msg);
-gint msg_calc_size(message * msg, gboolean is_smtp);
+void destroy_message(message *msg);
+void destroy_msg_list(GList *msg_list);
+void msg_free_data(message *msg);
+gint msg_calc_size(message *msg, gboolean is_smtp);
 
-msg_out *create_msg_out(message * msg);
-msg_out *clone_msg_out(msg_out * msgout_orig);
-void destroy_msg_out(msg_out * msgout);
-void destroy_msg_out_list(GList * msgout_list);
+msg_out *create_msg_out(message *msg);
+msg_out *clone_msg_out(msg_out *msgout_orig);
+void destroy_msg_out(msg_out *msgout);
+void destroy_msg_out_list(GList *msgout_list);
 
 /* address.c */
-address *create_address(gchar * path, gboolean is_rfc821);
-address *create_address_qualified(gchar * path, gboolean is_rfc821, gchar * domain);
-address *create_address_pipe(gchar * path);
-void destroy_address(address * addr);
-address *copy_modify_address(const address * orig, gchar * l_part, gchar * dom);
+address *create_address(gchar *path, gboolean is_rfc821);
+address *create_address_qualified(gchar *path, gboolean is_rfc821, gchar *domain);
+address *create_address_pipe(gchar *path);
+void destroy_address(address *addr);
+address *copy_modify_address(const address *orig, gchar *l_part, gchar *dom);
 #define copy_address(addr) copy_modify_address(addr, NULL, NULL)
-gboolean addr_isequal(address * addr1, address * addr2, int (*cmpfunc) (const char*, const char*));
-gboolean addr_isequal_parent(address * addr1, address * addr2, int (*cmpfunc) (const char*, const char*));
-address *addr_find_ancestor(address * addr);
-gboolean addr_is_delivered_children(address * addr);
-gboolean addr_is_finished_children(address * addr);
-gchar *addr_string(address * addr);
+gboolean addr_isequal(address *addr1, address *addr2, int (*cmpfunc) (const char*, const char*));
+gboolean addr_isequal_parent(address *addr1, address *addr2, int (*cmpfunc) (const char*, const char*));
+address *addr_find_ancestor(address *addr);
+gboolean addr_is_delivered_children(address *addr);
+gboolean addr_is_finished_children(address *addr);
+gchar *addr_string(address *addr);
 
 /* accept.c */
-accept_error accept_message(FILE * in, message * msg, guint flags);
-accept_error accept_message_prepare(message * msg, guint flags);
+accept_error accept_message(FILE *in, message *msg, guint flags);
+accept_error accept_message_prepare(message *msg, guint flags);
 
 /* header.c */
 gchar *rec_timestamp();
-GList *find_header(GList * hdr_list, header_id id, gchar * hdr_str);
-void header_unfold(header * hdr);
-void header_fold(header * hdr, unsigned int maxlen);
-header *create_header(header_id id, gchar * fmt, ...);
-void destroy_header(header * hdr);
-header *copy_header(header * hdr);
-header *get_header(gchar * line);
+GList *find_header(GList *hdr_list, header_id id, gchar *hdr_str);
+void header_unfold(header *hdr);
+void header_fold(header *hdr, unsigned int maxlen);
+header *create_header(header_id id, gchar *fmt, ...);
+void destroy_header(header *hdr);
+header *copy_header(header *hdr);
+header *get_header(gchar *line);
 
 /* smtp_in.c */
-void smtp_in(FILE * in, FILE * out, gchar * remote_host, gchar * ident);
+void smtp_in(FILE *in, FILE *out, gchar *remote_host, gchar *ident);
 
 /* listen.c */
-void listen_port(GList * addr_list, gint qival, char *argv[]);
+void listen_port(GList *addr_list, gint qival, char *argv[]);
 
 /* parse.c */
-gboolean split_address(const gchar * path, gchar ** local_part, gchar ** domain, gboolean is_rfc821);
-gboolean parse_address_rfc822(gchar * string, gchar ** local_begin, gchar ** local_end, gchar ** domain_begin, gchar ** domain_end, gchar ** address_end);
-gboolean parse_address_rfc821(gchar * string, gchar ** local_begin, gchar ** local_end, gchar ** domain_begin, gchar ** domain_end, gchar ** address_end);
-address *_create_address(gchar * string, gchar ** end, gboolean is_rfc821);
-address *create_address_rfc821(gchar * string, gchar ** end);
-address *create_address_rfc822(gchar * string, gchar ** end);
-GList *addr_list_append_rfc822(GList * addr_list, gchar * string, gchar * domain);
+gboolean split_address(const gchar *path, gchar **local_part, gchar **domain, gboolean is_rfc821);
+gboolean parse_address_rfc822(gchar *string, gchar **local_begin, gchar **local_end, gchar **domain_begin, gchar **domain_end, gchar **address_end);
+gboolean parse_address_rfc821(gchar *string, gchar **local_begin, gchar **local_end, gchar **domain_begin, gchar **domain_end, gchar **address_end);
+address *_create_address(gchar *string, gchar **end, gboolean is_rfc821);
+address *create_address_rfc821(gchar *string, gchar **end);
+address *create_address_rfc822(gchar *string, gchar **end);
+GList *addr_list_append_rfc822(GList *addr_list, gchar *string, gchar *domain);
 
 /* connect.c */
-mxip_addr *connect_hostlist(int *psockfd, gchar * host, guint port, GList * addr_list);
-mxip_addr *connect_resolvelist(int *psockfd, gchar * host, guint port, GList * res_funcs);
+mxip_addr *connect_hostlist(int *psockfd, gchar *host, guint port, GList *addr_list);
+mxip_addr *connect_resolvelist(int *psockfd, gchar *host, guint port, GList *res_funcs);
 
 /* deliver.c */
-void msg_rcptlist_local(GList * rcpt_list, GList **, GList **);
-gboolean deliver_local(msg_out * msgout);
-gboolean deliver_msglist_host(connect_route * route, GList * msg_list, gchar * host, GList * res_list);
-gboolean deliver_route_msgout_list(connect_route * route, GList * msgout_list);
-gboolean deliver_route_msg_list(connect_route * route, GList * msgout_list);
-gboolean deliver_finish(msg_out * msgout);
-gboolean deliver_msg_list(GList * msg_list, guint flags);
-gboolean deliver(message * msg);
+void msg_rcptlist_local(GList *rcpt_list, GList **, GList **);
+gboolean deliver_local(msg_out *msgout);
+gboolean deliver_msglist_host(connect_route *route, GList *msg_list, gchar *host, GList *res_list);
+gboolean deliver_route_msgout_list(connect_route *route, GList *msgout_list);
+gboolean deliver_route_msg_list(connect_route *route, GList *msgout_list);
+gboolean deliver_finish(msg_out *msgout);
+gboolean deliver_msg_list(GList *msg_list, guint flags);
+gboolean deliver(message *msg);
 
 /* fail_msg.c */
-gboolean fail_msg(message * msg, gchar * template, GList * failed_rcpts, gchar * err_fmt, va_list args);
-gboolean warn_msg(message * msg, gchar * template, GList * failed_rcpts, gchar * err_fmt, va_list args);
+gboolean fail_msg(message *msg, gchar *template, GList *failed_rcpts, gchar *err_fmt, va_list args);
+gboolean warn_msg(message *msg, gchar *template, GList *failed_rcpts, gchar *err_fmt, va_list args);
 
 /* interface.c */
-gboolean init_sockaddr(struct sockaddr_in *name, interface * iface);
-int make_server_socket(interface * iface);
+gboolean init_sockaddr(struct sockaddr_in *name, interface *iface);
+int make_server_socket(interface *iface);
 
 /* local.c */
-gboolean append_file(message * msg, GList * hdr_list, gchar * user);
-gboolean pipe_out(message * msg, GList * hdr_list, address * rcpt, gchar * cmd, guint flags);
+gboolean append_file(message *msg, GList *hdr_list, gchar *user);
+gboolean pipe_out(message *msg, GList *hdr_list, address *rcpt, gchar *cmd, guint flags);
 
 /* log.c */
 gchar *ext_strerror(int err);
@@ -445,58 +445,58 @@
 void maillog(const char *fmt, ...);
 
 /* spool.c */
-gboolean spool_read_data(message * msg);
-message *msg_spool_read(gchar * uid);
-gboolean spool_write(message * msg, gboolean do_writedata);
-gboolean spool_lock(gchar * uid);
-gboolean spool_unlock(gchar * uid);
-gboolean spool_delete_all(message * msg);
+gboolean spool_read_data(message *msg);
+message *msg_spool_read(gchar *uid);
+gboolean spool_write(message *msg, gboolean do_writedata);
+gboolean spool_lock(gchar *uid);
+gboolean spool_unlock(gchar *uid);
+gboolean spool_delete_all(message *msg);
 
 /* queue.c */
 GList *read_queue(void);
 gboolean queue_run(void);
 gboolean queue_run_online(void);
 void queue_list(void);
-gboolean queue_delete(gchar * uid);
+gboolean queue_delete(gchar *uid);
 
 /* online.c */
 gchar *online_query();
 
 /* permissions.c */
 gboolean is_ingroup(uid_t uid, gid_t gid);
-void set_euidgid(gint uid, gint gid, uid_t * old_uid, gid_t * old_gid);
-void set_identity(uid_t old_uid, gchar * task_name);
+void set_euidgid(gint uid, gint gid, uid_t *old_uid, gid_t *old_gid);
+void set_identity(uid_t old_uid, gchar *task_name);
 
 /* rewrite.c */
-gboolean set_address_header_domain(header * hdr, gchar * domain);
-gboolean map_address_header(header * hdr, GList * table);
+gboolean set_address_header_domain(header *hdr, gchar *domain);
+gboolean map_address_header(header *hdr, GList *table);
 
 /* route.c */
-msgout_perhost *create_msgout_perhost(gchar * host);
-void destroy_msgout_perhost(msgout_perhost * mo_ph);
-void rewrite_headers(msg_out * msgout, connect_route * route);
-void split_rcpts(GList* rcpt_list, GList* localnets, GList** rl_local, GList** rl_localnet, GList** rl_others);
-GList* local_rcpts(GList* rcpt_list);
-GList* remote_rcpts(GList* rcpt_list);
-gboolean route_strip_msgout(connect_route * route, msg_out * msgout);
-msg_out *route_prepare_msgout(connect_route * route, msg_out * msgout);
-GList *route_msgout_list(connect_route * route, GList * msgout_list);
-gboolean route_sender_is_allowed(connect_route * route, address * ret_path);
-void route_split_rcpts(connect_route * route, GList * rcpt_list, GList ** p_rcpt_list, GList ** p_non_rcpt_list);
+msgout_perhost *create_msgout_perhost(gchar *host);
+void destroy_msgout_perhost(msgout_perhost *mo_ph);
+void rewrite_headers(msg_out *msgout, connect_route *route);
+void split_rcpts(GList *rcpt_list, GList *localnets, GList **rl_local, GList **rl_localnet, GList **rl_others);
+GList *local_rcpts(GList *rcpt_list);
+GList *remote_rcpts(GList *rcpt_list);
+gboolean route_strip_msgout(connect_route *route, msg_out *msgout);
+msg_out *route_prepare_msgout(connect_route *route, msg_out *msgout);
+GList *route_msgout_list(connect_route *route, GList *msgout_list);
+gboolean route_sender_is_allowed(connect_route *route, address *ret_path);
+void route_split_rcpts(connect_route *route, GList *rcpt_list, GList **p_rcpt_list, GList **p_non_rcpt_list);
 
 /* tables.c */
-table_pair *create_pair(gchar * key, gpointer value);
-table_pair *create_pair_string(gchar * key, gpointer value);
-table_pair *parse_table_pair(gchar * line, char delim);
-gpointer *table_find_func(GList * table_list, gchar * key, int (*cmp_func) (const char *, const char *));
-gpointer *table_find(GList * table_list, gchar * key);
-gpointer *table_find_case(GList * table_list, gchar * key);
-gpointer *table_find_fnmatch(GList * table_list, gchar * key);
-GList *table_read(gchar * fname, gchar delim);
-void destroy_table(GList * table);
+table_pair *create_pair(gchar *key, gpointer value);
+table_pair *create_pair_string(gchar *key, gpointer value);
+table_pair *parse_table_pair(gchar *line, char delim);
+gpointer *table_find_func(GList *table_list, gchar *key, int (*cmp_func) (const char *, const char *));
+gpointer *table_find(GList *table_list, gchar *key);
+gpointer *table_find_case(GList *table_list, gchar *key);
+gpointer *table_find_fnmatch(GList *table_list, gchar *key);
+GList *table_read(gchar *fname, gchar delim);
+void destroy_table(GList *table);
 
 /* timeival.c */
-gint time_interval(gchar * str);
+gint time_interval(gchar *str);
 
 /* permissions.c */
 gboolean is_privileged_user(uid_t uid);
diff -r 934a223e4ee8 -r 41958685480d src/md5/hmac_md5.c
--- a/src/md5/hmac_md5.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/md5/hmac_md5.c	Thu Sep 22 15:07:40 2011 +0200
@@ -40,7 +40,7 @@
 Ensure digest points to hashsize bytes of allocated memory.
 */
 void
-hmac_md5(unsigned char* text, int textlen, unsigned char* key, int keylen, unsigned char* digest)
+hmac_md5(unsigned char *text, int textlen, unsigned char *key, int keylen, unsigned char *digest)
 {
 	int i;
 	MD5_CTX context;
diff -r 934a223e4ee8 -r 41958685480d src/md5/hmac_md5.h
--- a/src/md5/hmac_md5.h	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/md5/hmac_md5.h	Thu Sep 22 15:07:40 2011 +0200
@@ -1,7 +1,7 @@
 void hmac_md5(
-	unsigned char* text,   /* pointer to the message */
+	unsigned char *text,   /* pointer to the message */
 	int textlen,           /* length of the message */
-	unsigned char* key,    /* pointer to the authentication key */
+	unsigned char *key,    /* pointer to the authentication key */
 	int keylen,            /* length of the key */
-	unsigned char* digest  /* pointer to allocated memory to store the computed HMAC */
+	unsigned char *digest  /* pointer to allocated memory to store the computed HMAC */
 );
diff -r 934a223e4ee8 -r 41958685480d src/md5/hmactest.c
--- a/src/md5/hmactest.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/md5/hmactest.c	Thu Sep 22 15:07:40 2011 +0200
@@ -62,7 +62,7 @@
 	puts("---- Following are the test vectors from RFC 2104");
 
 
-	char* d01 = "Hi There";
+	char *d01 = "Hi There";
 	char k01[16];
 	for (i=0; i<16; i++) {
 		k01[i] = 0x0b;
@@ -75,8 +75,8 @@
 	printf(" (was computed)\n\n");
 
 
-	char* d02 = "what do ya want for nothing?";
-	char* k02 = "Jefe";
+	char *d02 = "what do ya want for nothing?";
+	char *k02 = "Jefe";
 	printf("750c783e6ab0b503eaa86e310a5db738 (should be)\n");
 	hmac_md5(d02, strlen(d02), k02, strlen(k02), digest);
 	for (i = 0; i < 16; i++) {
diff -r 934a223e4ee8 -r 41958685480d src/message.c
--- a/src/message.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/message.c	Thu Sep 22 15:07:40 2011 +0200
@@ -46,7 +46,7 @@
    internal format. Dot-stuffing is ignored in the size.
 */
 gint
-msg_calc_size(message * msg, gboolean is_smtp)
+msg_calc_size(message *msg, gboolean is_smtp)
 {
 	GList *node;
 	gint l_cnt = 0;  /* line count (we need to add so many '\r' for SMTP) */
@@ -91,7 +91,7 @@
 }
 
 void
-msg_free_data(message * msg)
+msg_free_data(message *msg)
 {
 	GList *node;
 
@@ -106,7 +106,7 @@
 }
 
 void
-destroy_message(message * msg)
+destroy_message(message *msg)
 {
 	GList *node;
 
@@ -149,7 +149,7 @@
 }
 
 void
-destroy_msg_list(GList * msg_list)
+destroy_msg_list(GList *msg_list)
 {
 	GList *msg_node;
 
@@ -161,7 +161,7 @@
 }
 
 msg_out*
-create_msg_out(message * msg)
+create_msg_out(message *msg)
 {
 	msg_out *msgout = g_malloc0(sizeof(msg_out));
 	msgout->msg = msg;
@@ -169,7 +169,7 @@
 }
 
 msg_out*
-clone_msg_out(msg_out * msgout_orig)
+clone_msg_out(msg_out *msgout_orig)
 {
 	if (msgout_orig) {
 		msg_out *msgout = create_msg_out(msgout_orig->msg);
@@ -192,7 +192,7 @@
 }
 
 void
-destroy_msg_out(msg_out * msgout)
+destroy_msg_out(msg_out *msgout)
 {
 	if (msgout) {
 		if (msgout->return_path)
@@ -212,7 +212,7 @@
 }
 
 void
-destroy_msg_out_list(GList * msgout_list)
+destroy_msg_out_list(GList *msgout_list)
 {
 	GList *msgout_node;
 
diff -r 934a223e4ee8 -r 41958685480d src/mservdetect.c
--- a/src/mservdetect.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/mservdetect.c	Thu Sep 22 15:07:40 2011 +0200
@@ -23,7 +23,7 @@
 
 
 gboolean
-init_sockaddr2(struct sockaddr_in * name, gchar* addr, int port)
+init_sockaddr2(struct sockaddr_in *name, gchar *addr, int port)
 {
 	struct hostent *he;
 	struct in_addr ia;
@@ -46,7 +46,7 @@
 
 
 gchar*
-mserver_detect_online(gchar* addr, int port)
+mserver_detect_online(gchar *addr, int port)
 {
 	struct sockaddr_in saddr;
 	gchar *ret = NULL;
@@ -128,7 +128,7 @@
 int
 main(int argc, char *argv[])
 {
-	gchar* addr;
+	gchar *addr;
 	int port;
 	gchar *name;
 
diff -r 934a223e4ee8 -r 41958685480d src/online.c
--- a/src/online.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/online.c	Thu Sep 22 15:07:40 2011 +0200
@@ -26,7 +26,7 @@
 gchar*
 online_query()
 {
-	gchar* pipe = conf.online_query;
+	gchar *pipe = conf.online_query;
 	pid_t pid;
 	void (*old_signal) (int);
 	int status;
diff -r 934a223e4ee8 -r 41958685480d src/parse.c
--- a/src/parse.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/parse.c	Thu Sep 22 15:07:40 2011 +0200
@@ -35,7 +35,7 @@
 char *parse_error = NULL;
 
 static gchar*
-skip_comment(gchar * p)
+skip_comment(gchar *p)
 {
 
 #ifdef PARSE_TEST
@@ -55,7 +55,7 @@
 }
 
 static gboolean
-read_word(gchar * p, gchar ** b, gchar ** e)
+read_word(gchar *p, gchar **b, gchar **e)
 {
 #ifdef PARSE_TEST
 	g_print("read_word: %s\n", p);
@@ -85,7 +85,7 @@
 }
 
 static gboolean
-read_word_with_dots(gchar * p, gchar ** b, gchar ** e)
+read_word_with_dots(gchar *p, gchar **b, gchar **e)
 {
 	gchar *b0 = p;
 
@@ -108,7 +108,7 @@
 }
 
 static gboolean
-read_domain(gchar * p, gchar ** b, gchar ** e)
+read_domain(gchar *p, gchar **b, gchar **e)
 {
 #ifdef PARSE_TEST
 	g_print("read_domain: %s\n", p);
@@ -134,8 +134,8 @@
 }
 
 gboolean
-parse_address_rfc822(gchar* string, gchar** local_begin, gchar** local_end, gchar** domain_begin,
-                     gchar** domain_end, gchar** address_end)
+parse_address_rfc822(gchar *string, gchar **local_begin, gchar **local_end, gchar **domain_begin,
+                     gchar **domain_end, gchar **address_end)
 {
 	gint angle_brackets = 0;
 
@@ -284,8 +284,8 @@
 }
 
 gboolean
-parse_address_rfc821(gchar* string, gchar** local_begin, gchar** local_end, gchar** domain_begin,
-                     gchar** domain_end, gchar** address_end)
+parse_address_rfc821(gchar *string, gchar **local_begin, gchar **local_end, gchar **domain_begin,
+                     gchar **domain_end, gchar **address_end)
 {
 	gint angle_brackets = 0;
 
@@ -379,7 +379,7 @@
   parses both rfc 821 and rfc 822 addresses, depending on flag is_rfc821
 */
 address*
-_create_address(gchar * string, gchar ** end, gboolean is_rfc821)
+_create_address(gchar *string, gchar **end, gboolean is_rfc821)
 {
 	gchar *loc_beg, *loc_end;
 	gchar *dom_beg, *dom_end;
@@ -448,19 +448,19 @@
 }
 
 address*
-create_address_rfc822(gchar * string, gchar ** end)
+create_address_rfc822(gchar *string, gchar **end)
 {
 	return _create_address(string, end, FALSE);
 }
 
 address*
-create_address_rfc821(gchar * string, gchar ** end)
+create_address_rfc821(gchar *string, gchar **end)
 {
 	return _create_address(string, end, TRUE);
 }
 
 GList*
-addr_list_append_rfc822(GList * addr_list, gchar * string, gchar * domain)
+addr_list_append_rfc822(GList *addr_list, gchar *string, gchar *domain)
 {
 	gchar *p = string;
 	gchar *end;
diff -r 934a223e4ee8 -r 41958685480d src/permissions.c
--- a/src/permissions.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/permissions.c	Thu Sep 22 15:07:40 2011 +0200
@@ -53,7 +53,7 @@
 is_privileged_user(uid_t uid)
 {
 	/* uncomment these lines if you need the `uucp' group to be trusted too
-	struct group* grent = getgrnam("uucp");
+	struct group *grent = getgrnam("uucp");
 
 	if (is_ingroup(uid, grent->gr_gid)) {
 		return TRUE;
@@ -64,7 +64,7 @@
 }
 
 void
-set_euidgid(gint uid, gint gid, uid_t * old_uid, gid_t * old_gid)
+set_euidgid(gint uid, gint gid, uid_t *old_uid, gid_t *old_gid)
 {
 	if (old_uid)
 		*old_uid = geteuid();
@@ -84,7 +84,7 @@
 }
 
 void
-set_identity(uid_t old_uid, gchar * task_name)
+set_identity(uid_t old_uid, gchar *task_name)
 {
 	if (!conf.run_as_user) {
 		if (!is_privileged_user(old_uid)) {
diff -r 934a223e4ee8 -r 41958685480d src/queue.c
--- a/src/queue.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/queue.c	Thu Sep 22 15:07:40 2011 +0200
@@ -189,7 +189,7 @@
 }
 
 gboolean
-queue_delete(gchar * uid)
+queue_delete(gchar *uid)
 {
 	gboolean hdr_ok = TRUE;
 	gboolean dat_ok = TRUE;
diff -r 934a223e4ee8 -r 41958685480d src/readsock.c
--- a/src/readsock.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/readsock.c	Thu Sep 22 15:07:40 2011 +0200
@@ -59,7 +59,7 @@
 }
 
 static void
-_read_chug(FILE * in)
+_read_chug(FILE *in)
 {
 	int c = 0;
 
@@ -70,7 +70,7 @@
 }
 
 static int
-_read_line(FILE * in, char *buf, int buf_len, int timeout)
+_read_line(FILE *in, char *buf, int buf_len, int timeout)
 {
 	int p = 0;
 	int c = 0;
@@ -97,7 +97,7 @@
 }
 
 int
-read_sockline(FILE * in, char *buf, int buf_len, int timeout, unsigned int flags)
+read_sockline(FILE *in, char *buf, int buf_len, int timeout, unsigned int flags)
 {
 	int p = 0;
 
@@ -131,7 +131,7 @@
 }
 
 int
-read_sockline1(FILE * in, char **pbuf, int *buf_len, int timeout, unsigned int flags)
+read_sockline1(FILE *in, char **pbuf, int *buf_len, int timeout, unsigned int flags)
 {
 	int p = 0, size = *buf_len;
 	char *buf;
diff -r 934a223e4ee8 -r 41958685480d src/readsock.h
--- a/src/readsock.h	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/readsock.h	Thu Sep 22 15:07:40 2011 +0200
@@ -20,5 +20,5 @@
 #define READSOCKL_CVT_CRLF 0x02
 
 
-int read_sockline(FILE * in, char *buf, int buf_len, int timeout, unsigned int flags);
-int read_sockline1(FILE * in, char **pbuf, int *size, int timeout, unsigned int flags);
+int read_sockline(FILE *in, char *buf, int buf_len, int timeout, unsigned int flags);
+int read_sockline1(FILE *in, char **pbuf, int *size, int timeout, unsigned int flags);
diff -r 934a223e4ee8 -r 41958685480d src/rewrite.c
--- a/src/rewrite.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/rewrite.c	Thu Sep 22 15:07:40 2011 +0200
@@ -21,7 +21,7 @@
 #endif
 
 gboolean
-set_address_header_domain(header * hdr, gchar * domain)
+set_address_header_domain(header *hdr, gchar *domain)
 {
 	gchar *p = hdr->value;
 	gchar *new_hdr = g_strndup(hdr->header, hdr->value - hdr->header);
@@ -67,7 +67,7 @@
 }
 
 gboolean
-map_address_header(header * hdr, GList * table)
+map_address_header(header *hdr, GList *table)
 {
 	GList *addr_list = addr_list_append_rfc822(NULL, hdr->value, conf.host_name);
 	GList *addr_node;
diff -r 934a223e4ee8 -r 41958685480d src/route.c
--- a/src/route.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/route.c	Thu Sep 22 15:07:40 2011 +0200
@@ -22,7 +22,7 @@
 #include "masqmail.h"
 
 msgout_perhost*
-create_msgout_perhost(gchar * host)
+create_msgout_perhost(gchar *host)
 {
 	msgout_perhost *mo_ph = g_malloc(sizeof(msgout_perhost));
 	if (mo_ph) {
@@ -33,7 +33,7 @@
 }
 
 void
-destroy_msgout_perhost(msgout_perhost * mo_ph)
+destroy_msgout_perhost(msgout_perhost *mo_ph)
 {
 	GList *mo_node;
 
@@ -48,7 +48,7 @@
 }
 
 void
-rewrite_headers(msg_out * msgout, connect_route * route)
+rewrite_headers(msg_out *msgout, connect_route *route)
 {
 	/* if set_h_from_domain is set, replace domain in all
 	   From: headers.
@@ -198,7 +198,7 @@
 If patterns is NULL: only splitting between local and others is done.
 */
 void
-split_rcpts(GList* rcpt_list, GList* patterns, GList** rl_local, GList** rl_matching, GList** rl_others)
+split_rcpts(GList *rcpt_list, GList *patterns, GList **rl_local, GList **rl_matching, GList **rl_others)
 {
 	GList *rcpt_node;
 	GList *host_node = NULL;
@@ -238,7 +238,7 @@
 TODO: This function is almost exactly the same as remote_rcpts(). Merge?
 */
 GList*
-local_rcpts(GList* rcpt_list)
+local_rcpts(GList *rcpt_list)
 {
 	GList *rcpt_node;
 	GList *local_rcpts = NULL;
@@ -261,7 +261,7 @@
 TODO: This function is almost exactly the same as local_rcpts(). Merge?
 */
 GList*
-remote_rcpts(GList* rcpt_list)
+remote_rcpts(GList *rcpt_list)
 {
 	GList *rcpt_node;
 	GList *remote_rcpts = NULL;
@@ -283,8 +283,8 @@
 _g_list_addrcmp(gconstpointer pattern, gconstpointer addr)
 {
 	int res;
-	address* patternaddr = (address*) pattern;
-	address* stringaddr = (address*) addr;
+	address *patternaddr = (address*) pattern;
+	address *stringaddr = (address*) addr;
 
 	DEBUG(6) debugf("_g_list_addrcmp: pattern `%s' `%s' on string `%s' `%s'\n",
 	                patternaddr->local_part, patternaddr->domain,
@@ -301,7 +301,7 @@
 }
 
 gboolean
-route_sender_is_allowed(connect_route * route, address * ret_path)
+route_sender_is_allowed(connect_route *route, address *ret_path)
 {
 	if (route->denied_senders && g_list_find_custom(route->denied_senders, ret_path, _g_list_addrcmp)) {
 		return FALSE;
@@ -321,7 +321,7 @@
    Local domains are NOT regared here, these should be sorted out previously
 */
 void
-route_split_rcpts(connect_route * route, GList * rcpt_list, GList ** p_rcpt_list, GList ** p_non_rcpt_list)
+route_split_rcpts(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: */
@@ -339,7 +339,7 @@
 }
 
 msg_out*
-route_prepare_msgout(connect_route * route, msg_out * msgout)
+route_prepare_msgout(connect_route *route, msg_out *msgout)
 {
 	message *msg = msgout->msg;
 	GList *rcpt_list = msgout->rcpt_list;
@@ -389,7 +389,7 @@
  */
 
 GList*
-route_msgout_list(connect_route * route, GList * msgout_list)
+route_msgout_list(connect_route *route, GList *msgout_list)
 {
 	GList *mo_ph_list = NULL;
 	GList *msgout_node;
diff -r 934a223e4ee8 -r 41958685480d src/smtp_in.c
--- a/src/smtp_in.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/smtp_in.c	Thu Sep 22 15:07:40 2011 +0200
@@ -43,7 +43,7 @@
 };
 
 static smtp_cmd_id
-get_id(const gchar * line)
+get_id(const gchar *line)
 {
 	gint i;
 	for (i = 0; i < SMTP_NUM_IDS; i++) {
@@ -80,7 +80,7 @@
    Return false if address is too long.
 */
 static gboolean
-get_address(gchar * line, gchar * addr)
+get_address(gchar *line, gchar *addr)
 {
 	gchar *p = line;
 	gchar *q = addr;
@@ -110,7 +110,7 @@
 }
 
 static smtp_connection*
-create_base(gchar * remote_host)
+create_base(gchar *remote_host)
 {
 	smtp_connection *base = g_malloc(sizeof(smtp_connection));
 	if (!base) {
@@ -130,7 +130,7 @@
 }
 
 static void
-smtp_printf(FILE * out, gchar * fmt, ...)
+smtp_printf(FILE *out, gchar *fmt, ...)
 {
 	va_list args;
 	va_start(args, fmt);
@@ -153,7 +153,7 @@
 }
 
 void
-smtp_in(FILE * in, FILE * out, gchar * remote_host, gchar * ident)
+smtp_in(FILE *in, FILE *out, gchar *remote_host, gchar *ident)
 {
 	gchar *buffer;
 	smtp_cmd_id cmd_id;
diff -r 934a223e4ee8 -r 41958685480d src/smtp_out.c
--- a/src/smtp_out.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/smtp_out.c	Thu Sep 22 15:07:40 2011 +0200
@@ -37,7 +37,7 @@
 #endif
 
 void
-destroy_smtpbase(smtp_base * psb)
+destroy_smtpbase(smtp_base *psb)
 {
 	fclose(psb->in);
 	fclose(psb->out);
@@ -60,7 +60,7 @@
 }
 
 gchar*
-set_heloname(smtp_base * psb, gchar * default_name, gboolean do_correct)
+set_heloname(smtp_base *psb, gchar *default_name, gboolean do_correct)
 {
 	struct sockaddr_in sname;
 	int len = sizeof(struct sockaddr_in);
@@ -90,7 +90,7 @@
 #ifdef ENABLE_AUTH
 
 gboolean
-set_auth(smtp_base * psb, gchar * name, gchar * login, gchar * secret)
+set_auth(smtp_base *psb, gchar *name, gchar *login, gchar *secret)
 {
 	if ((strcasecmp(name, "CRAM-MD5") == 0) || (strcasecmp(name, "LOGIN") == 0)) {
 		psb->auth_name = g_strdup(name);
@@ -136,7 +136,7 @@
 }
 
 static gboolean
-read_response(smtp_base * psb, int timeout)
+read_response(smtp_base *psb, int timeout)
 {
 	gint buf_pos = 0;
 	gchar code[5];
@@ -170,7 +170,7 @@
 }
 
 static gboolean
-check_response(smtp_base * psb, gboolean after_data)
+check_response(smtp_base *psb, gboolean after_data)
 {
 	char c = psb->buffer[0];
 
@@ -191,7 +191,7 @@
 }
 
 static gchar*
-get_response_arg(gchar * response)
+get_response_arg(gchar *response)
 {
 	gchar buf[SMTP_BUF_LEN];
 	gchar *p = response, *q = buf;
@@ -208,7 +208,7 @@
 }
 
 static gboolean
-check_helo_response(smtp_base * psb)
+check_helo_response(smtp_base *psb)
 {
 	gchar *ptr;
 
@@ -292,7 +292,7 @@
 greeting messages.
 */
 static gboolean
-smtp_helo(smtp_base * psb, gchar * helo)
+smtp_helo(smtp_base *psb, gchar *helo)
 {
 	fprintf(psb->out, "EHLO %s\r\n", helo);
 	fflush(psb->out);
@@ -330,7 +330,7 @@
 }
 
 static void
-smtp_cmd_mailfrom(smtp_base * psb, address * return_path, guint size)
+smtp_cmd_mailfrom(smtp_base *psb, address *return_path, guint size)
 {
 	if (psb->use_size) {
 		fprintf(psb->out, "MAIL FROM:%s SIZE=%d\r\n", addr_string(return_path), size);
@@ -347,7 +347,7 @@
 }
 
 static void
-smtp_cmd_rcptto(smtp_base * psb, address * rcpt)
+smtp_cmd_rcptto(smtp_base *psb, address *rcpt)
 {
 	fprintf(psb->out, "RCPT TO:%s\r\n", addr_string(rcpt));
 	fflush(psb->out);
@@ -355,7 +355,7 @@
 }
 
 static void
-send_data_line(smtp_base * psb, gchar * data)
+send_data_line(smtp_base *psb, gchar *data)
 {
 	/* According to RFC 821 each line should be terminated with CRLF.
 	   Since a dot on a line itself marks the end of data, each line
@@ -386,7 +386,7 @@
 }
 
 static void
-send_header(smtp_base * psb, GList * hdr_list)
+send_header(smtp_base *psb, GList *hdr_list)
 {
 	GList *node;
 	gint num_hdrs = 0;
@@ -412,7 +412,7 @@
 }
 
 static void
-send_data(smtp_base * psb, message * msg)
+send_data(smtp_base *psb, message *msg)
 {
 	GList *node;
 	gint num_lines = 0;
@@ -435,7 +435,7 @@
 }
 
 void
-smtp_out_mark_rcpts(smtp_base * psb, GList * rcpt_list)
+smtp_out_mark_rcpts(smtp_base *psb, GList *rcpt_list)
 {
 	GList *rcpt_node;
 	for (rcpt_node = g_list_first(rcpt_list); rcpt_node; rcpt_node = g_list_next(rcpt_node)) {
@@ -452,7 +452,7 @@
 }
 
 void
-smtp_out_log_failure(smtp_base * psb, message * msg)
+smtp_out_log_failure(smtp_base *psb, message *msg)
 {
 	gchar *err_str;
 
@@ -477,7 +477,7 @@
 }
 
 smtp_base*
-smtp_out_open(gchar * host, gint port, GList * resolve_list)
+smtp_out_open(gchar *host, gint port, GList *resolve_list)
 {
 	smtp_base *psb;
 	gint sock;
@@ -505,7 +505,7 @@
 }
 
 smtp_base*
-smtp_out_open_child(gchar * cmd, char* host)
+smtp_out_open_child(gchar *cmd, char *host)
 {
 	smtp_base *psb;
 	gint sock;
@@ -524,7 +524,7 @@
 }
 
 gboolean
-smtp_out_rset(smtp_base * psb)
+smtp_out_rset(smtp_base *psb)
 {
 	gboolean ok;
 
@@ -544,7 +544,7 @@
 #ifdef ENABLE_AUTH
 
 static gboolean
-smtp_out_auth_cram_md5(smtp_base * psb)
+smtp_out_auth_cram_md5(smtp_base *psb)
 {
 	gboolean ok = FALSE;
 
@@ -596,7 +596,7 @@
 }
 
 static gboolean
-smtp_out_auth_login(smtp_base * psb)
+smtp_out_auth_login(smtp_base *psb)
 {
 	gboolean ok = FALSE;
 	fprintf(psb->out, "AUTH LOGIN\r\n");
@@ -644,7 +644,7 @@
 }
 
 gboolean
-smtp_out_auth(smtp_base * psb)
+smtp_out_auth(smtp_base *psb)
 {
 	gboolean ok = FALSE;
 	gint i = 0;
@@ -670,7 +670,7 @@
 #endif
 
 gboolean
-smtp_out_init(smtp_base * psb, gboolean instant_helo)
+smtp_out_init(smtp_base *psb, gboolean instant_helo)
 {
 	gboolean ok;
 
@@ -702,7 +702,7 @@
 }
 
 gint
-smtp_out_msg(smtp_base * psb, message * msg, address * return_path, GList * rcpt_list, GList * hdr_list)
+smtp_out_msg(smtp_base *psb, message *msg, address *return_path, GList *rcpt_list, GList *hdr_list)
 {
 	gint i, size;
 	gboolean ok = TRUE;
@@ -882,7 +882,7 @@
 }
 
 gboolean
-smtp_out_quit(smtp_base * psb)
+smtp_out_quit(smtp_base *psb)
 {
 	fprintf(psb->out, "QUIT\r\n");
 	fflush(psb->out);
@@ -895,7 +895,7 @@
 }
 
 gint
-smtp_deliver(gchar * host, gint port, GList * resolve_list, message * msg, address * return_path, GList * rcpt_list)
+smtp_deliver(gchar *host, gint port, GList *resolve_list, message *msg, address *return_path, GList *rcpt_list)
 {
 	smtp_base *psb;
 	smtp_error err;
diff -r 934a223e4ee8 -r 41958685480d src/smtp_out.h
--- a/src/smtp_out.h	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/smtp_out.h	Thu Sep 22 15:07:40 2011 +0200
@@ -70,14 +70,14 @@
 
 } smtp_base;
 
-gchar *set_heloname(smtp_base * psb, gchar * default_name, gboolean do_correct);
-gboolean set_auth(smtp_base * psb, gchar * name, gchar * login, gchar * secret);
-void destroy_smtpbase(smtp_base * psb);
-smtp_base *smtp_out_open(gchar * host, gint port, GList * resolve_list);
-smtp_base *smtp_out_open_child(gchar * cmd, char* host);
-gboolean smtp_out_rset(smtp_base * psb);
-gboolean smtp_out_init(smtp_base * psb, gboolean instant_helo);
-gint smtp_out_msg(smtp_base * psb, message * msg, address * return_path, GList * rcpt_list, GList * hdr_list);
-gboolean smtp_out_quit(smtp_base * psb);
+gchar *set_heloname(smtp_base *psb, gchar *default_name, gboolean do_correct);
+gboolean set_auth(smtp_base *psb, gchar *name, gchar *login, gchar *secret);
+void destroy_smtpbase(smtp_base *psb);
+smtp_base *smtp_out_open(gchar *host, gint port, GList *resolve_list);
+smtp_base *smtp_out_open_child(gchar *cmd, char *host);
+gboolean smtp_out_rset(smtp_base *psb);
+gboolean smtp_out_init(smtp_base *psb, gboolean instant_helo);
+gint smtp_out_msg(smtp_base *psb, message *msg, address *return_path, GList *rcpt_list, GList *hdr_list);
+gboolean smtp_out_quit(smtp_base *psb);
 
-gint smtp_deliver(gchar * host, gint port, GList * resolve_list, message * msg, address * return_path, GList * rcpt_list);
+gint smtp_deliver(gchar *host, gint port, GList *resolve_list, message *msg, address *return_path, GList *rcpt_list);
diff -r 934a223e4ee8 -r 41958685480d src/spool.c
--- a/src/spool.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/spool.c	Thu Sep 22 15:07:40 2011 +0200
@@ -23,7 +23,7 @@
 #include "dotlock.h"
 
 static gint
-read_line(FILE * in, gchar * buf, gint buf_len)
+read_line(FILE *in, gchar *buf, gint buf_len)
 {
 	gint p = 0;
 	gint c;
@@ -49,7 +49,7 @@
 }
 
 static void
-spool_write_rcpt(FILE * out, address * rcpt)
+spool_write_rcpt(FILE *out, address *rcpt)
 {
 	gchar dlvrd_char = addr_is_delivered(rcpt) ? 'X' : (addr_is_failed(rcpt) ? 'F' : ' ');
 
@@ -68,7 +68,7 @@
 }
 
 static address*
-spool_scan_rcpt(gchar * line)
+spool_scan_rcpt(gchar *line)
 {
 	address *rcpt = NULL;
 
@@ -88,7 +88,7 @@
 }
 
 gboolean
-spool_read_data(message * msg)
+spool_read_data(message *msg)
 {
 	FILE *in;
 	gchar *spool_file;
@@ -119,7 +119,7 @@
 }
 
 gboolean
-spool_read_header(message * msg)
+spool_read_header(message *msg)
 {
 	FILE *in;
 	gchar *spool_file;
@@ -201,7 +201,7 @@
 }
 
 message*
-msg_spool_read(gchar * uid)
+msg_spool_read(gchar *uid)
 {
 	message *msg;
 	gboolean ok = FALSE;
@@ -220,7 +220,7 @@
    mail ids. Better call spool_write(msg, FALSE).
 */
 static gboolean
-spool_write_header(message * msg)
+spool_write_header(message *msg)
 {
 	GList *node;
 	gchar *spool_file, *tmp_file;
@@ -295,7 +295,7 @@
 }
 
 gboolean
-spool_write(message * msg, gboolean do_write_data)
+spool_write(message *msg, gboolean do_write_data)
 {
 	GList *list;
 	gchar *spool_file, *tmp_file;
@@ -360,7 +360,7 @@
 #define MAX_LOCKAGE 300
 
 gboolean
-spool_lock(gchar * uid)
+spool_lock(gchar *uid)
 {
 	uid_t saved_uid, saved_gid;
 	gchar *hitch_name;
@@ -391,7 +391,7 @@
 }
 
 gboolean
-spool_unlock(gchar * uid)
+spool_unlock(gchar *uid)
 {
 	uid_t saved_uid, saved_gid;
 	gchar *lock_name;
@@ -413,7 +413,7 @@
 }
 
 gboolean
-spool_delete_all(message * msg)
+spool_delete_all(message *msg)
 {
 	uid_t saved_uid, saved_gid;
 	gchar *spool_file;
diff -r 934a223e4ee8 -r 41958685480d src/tables.c
--- a/src/tables.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/tables.c	Thu Sep 22 15:07:40 2011 +0200
@@ -22,7 +22,7 @@
 #include "masqmail.h"
 
 table_pair*
-create_pair(gchar * key, gpointer value)
+create_pair(gchar *key, gpointer value)
 {
 	table_pair *pair;
 
@@ -34,7 +34,7 @@
 }
 
 table_pair*
-create_pair_string(gchar * key, gpointer value)
+create_pair_string(gchar *key, gpointer value)
 {
 	table_pair *pair;
 
@@ -46,7 +46,7 @@
 }
 
 table_pair*
-parse_table_pair(gchar * line, char delim)
+parse_table_pair(gchar *line, char delim)
 {
 	gchar buf[256];
 	gchar *p, *q;
@@ -72,7 +72,7 @@
 }
 
 gpointer*
-table_find_func(GList * table_list, gchar * key, int (*cmp_func) (const char *, const char *))
+table_find_func(GList *table_list, gchar *key, int (*cmp_func) (const char *, const char *))
 {
 	GList *node;
 
@@ -85,13 +85,13 @@
 }
 
 gpointer*
-table_find(GList * table_list, gchar * key)
+table_find(GList *table_list, gchar *key)
 {
 	return table_find_func(table_list, key, strcmp);
 }
 
 gpointer*
-table_find_case(GList * table_list, gchar * key)
+table_find_case(GList *table_list, gchar *key)
 {
 	return table_find_func(table_list, key, strcasecmp);
 }
@@ -103,13 +103,13 @@
 }
 
 gpointer*
-table_find_fnmatch(GList * table_list, gchar * key)
+table_find_fnmatch(GList *table_list, gchar *key)
 {
 	return table_find_func(table_list, key, fnmatch0);
 }
 
 GList*
-table_read(gchar * fname, gchar delim)
+table_read(gchar *fname, gchar delim)
 {
 	GList *list = NULL;
 	FILE *fptr;
@@ -137,7 +137,7 @@
 }
 
 void
-destroy_table(GList * table)
+destroy_table(GList *table)
 {
 	GList *node;
 
diff -r 934a223e4ee8 -r 41958685480d src/timeival.c
--- a/src/timeival.c	Wed Sep 14 12:20:40 2011 +0200
+++ b/src/timeival.c	Thu Sep 22 15:07:40 2011 +0200
@@ -22,7 +22,7 @@
 #include "masqmail.h"
 
 gint
-time_interval(gchar * str)
+time_interval(gchar *str)
 {
 	gchar buf[16];
 	gchar *p = str, *q = buf;