masqmail

changeset 366:41958685480d

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.
author markus schnalke <meillo@marmaro.de>
date Thu, 22 Sep 2011 15:07:40 +0200
parents 934a223e4ee8
children b27f66555ba8
files src/accept.c src/address.c src/alias.c src/base64/base64.c src/base64/base64.h src/conf.c src/connect.c src/deliver.c src/dotlock.c src/dotlock.h src/expand.c src/fail_msg.c src/header.c src/interface.c src/listen.c src/local.c src/lookup.c src/lookup.h src/masqmail.c src/masqmail.h src/md5/hmac_md5.c src/md5/hmac_md5.h src/md5/hmactest.c src/message.c src/mservdetect.c src/online.c src/parse.c src/permissions.c src/queue.c src/readsock.c src/readsock.h src/rewrite.c src/route.c src/smtp_in.c src/smtp_out.c src/smtp_out.h src/spool.c src/tables.c src/timeival.c
diffstat 39 files changed, 328 insertions(+), 328 deletions(-) [+]
line diff
     1.1 --- a/src/accept.c	Wed Sep 14 12:20:40 2011 +0200
     1.2 +++ b/src/accept.c	Thu Sep 22 15:07:40 2011 +0200
     1.3 @@ -29,7 +29,7 @@
     1.4  };
     1.5  
     1.6  static gchar*
     1.7 -string_base62(gchar * res, guint value, gchar len)
     1.8 +string_base62(gchar *res, guint value, gchar len)
     1.9  {
    1.10  	static gchar base62_chars[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
    1.11  	gchar *p = res + len;
    1.12 @@ -62,7 +62,7 @@
    1.13  */
    1.14  
    1.15  accept_error
    1.16 -accept_message_stream(FILE * in, message * msg, guint flags)
    1.17 +accept_message_stream(FILE *in, message *msg, guint flags)
    1.18  {
    1.19  	gchar *line, *line1;
    1.20  	int line_size = MAX_DATALINE;
    1.21 @@ -131,7 +131,7 @@
    1.22  			if (line1[0] == ' ' || line1[0] == '\t') {
    1.23  				/* continuation of 'folded' header: */
    1.24  				if (hdr) {
    1.25 -					char* cp;
    1.26 +					char *cp;
    1.27  					cp = g_strconcat(hdr->header, line1, NULL);
    1.28  					hdr->value = cp + (hdr->value - hdr->header);
    1.29  					free(hdr->header);
    1.30 @@ -186,7 +186,7 @@
    1.31  }
    1.32  
    1.33  accept_error
    1.34 -accept_message_prepare(message * msg, guint flags)
    1.35 +accept_message_prepare(message *msg, guint flags)
    1.36  {
    1.37  	struct passwd *passwd = NULL;
    1.38  	time_t rec_time = time(NULL);
    1.39 @@ -399,7 +399,7 @@
    1.40  }
    1.41  
    1.42  accept_error
    1.43 -accept_message(FILE * in, message * msg, guint flags)
    1.44 +accept_message(FILE *in, message *msg, guint flags)
    1.45  {
    1.46  	accept_error err;
    1.47  
     2.1 --- a/src/address.c	Wed Sep 14 12:20:40 2011 +0200
     2.2 +++ b/src/address.c	Thu Sep 22 15:07:40 2011 +0200
     2.3 @@ -19,7 +19,7 @@
     2.4  #include "masqmail.h"
     2.5  
     2.6  address*
     2.7 -create_address(gchar * path, gboolean is_rfc821)
     2.8 +create_address(gchar *path, gboolean is_rfc821)
     2.9  {
    2.10  	address *addr;
    2.11  	addr = _create_address(path, NULL, is_rfc821);
    2.12 @@ -31,7 +31,7 @@
    2.13  }
    2.14  
    2.15  address*
    2.16 -create_address_qualified(gchar * path, gboolean is_rfc821, gchar * domain)
    2.17 +create_address_qualified(gchar *path, gboolean is_rfc821, gchar *domain)
    2.18  {
    2.19  	address *addr = create_address(path, is_rfc821);
    2.20  
    2.21 @@ -43,7 +43,7 @@
    2.22  
    2.23  /* nothing special about pipes here, but its only called for that purpose */
    2.24  address*
    2.25 -create_address_pipe(gchar * path)
    2.26 +create_address_pipe(gchar *path)
    2.27  {
    2.28  	address *addr = g_malloc(sizeof(address));
    2.29  
    2.30 @@ -58,7 +58,7 @@
    2.31  }
    2.32  
    2.33  void
    2.34 -destroy_address(address * addr)
    2.35 +destroy_address(address *addr)
    2.36  {
    2.37  	DEBUG(6) debugf("destroy_address entered\n");
    2.38  
    2.39 @@ -70,7 +70,7 @@
    2.40  }
    2.41  
    2.42  address*
    2.43 -copy_modify_address(const address * orig, gchar * l_part, gchar * dom)
    2.44 +copy_modify_address(const address *orig, gchar *l_part, gchar *dom)
    2.45  {
    2.46  	address *addr = NULL;
    2.47  
    2.48 @@ -101,7 +101,7 @@
    2.49  }
    2.50  
    2.51  gboolean
    2.52 -addr_isequal(address * addr1, address * addr2, int (*cmpfunc) (const char*, const char*))
    2.53 +addr_isequal(address *addr1, address *addr2, int (*cmpfunc) (const char*, const char*))
    2.54  {
    2.55  	return (cmpfunc(addr1->local_part, addr2->local_part) == 0)
    2.56  	       && (strcasecmp(addr1->domain, addr2->domain) == 0);
    2.57 @@ -109,7 +109,7 @@
    2.58  
    2.59  /* searches in ancestors of addr1 */
    2.60  gboolean
    2.61 -addr_isequal_parent(address* addr1, address* addr2, int (*cmpfunc) (const char*, const char*))
    2.62 +addr_isequal_parent(address *addr1, address *addr2, int (*cmpfunc) (const char*, const char*))
    2.63  {
    2.64  	address *addr;
    2.65  
    2.66 @@ -123,7 +123,7 @@
    2.67  /* careful, this is recursive */
    2.68  /* returns TRUE if ALL children have been delivered */
    2.69  gboolean
    2.70 -addr_is_delivered_children(address * addr)
    2.71 +addr_is_delivered_children(address *addr)
    2.72  {
    2.73  	GList *addr_node;
    2.74  
    2.75 @@ -141,7 +141,7 @@
    2.76  /* careful, this is recursive */
    2.77  /* returns TRUE if ALL children have been either delivered or have failed */
    2.78  gboolean
    2.79 -addr_is_finished_children(address * addr)
    2.80 +addr_is_finished_children(address *addr)
    2.81  {
    2.82  	GList *addr_node;
    2.83  
    2.84 @@ -158,7 +158,7 @@
    2.85  
    2.86  /* find original address */
    2.87  address*
    2.88 -addr_find_ancestor(address * addr)
    2.89 +addr_find_ancestor(address *addr)
    2.90  {
    2.91  	while (addr->parent)
    2.92  		addr = addr->parent;
    2.93 @@ -166,7 +166,7 @@
    2.94  }
    2.95  
    2.96  gchar*
    2.97 -addr_string(address * addr)
    2.98 +addr_string(address *addr)
    2.99  {
   2.100  	static gchar *buffer = NULL;
   2.101  
     3.1 --- a/src/alias.c	Wed Sep 14 12:20:40 2011 +0200
     3.2 +++ b/src/alias.c	Thu Sep 22 15:07:40 2011 +0200
     3.3 @@ -21,7 +21,7 @@
     3.4  #include <fnmatch.h>
     3.5  
     3.6  gboolean
     3.7 -addr_is_local(address * addr)
     3.8 +addr_is_local(address *addr)
     3.9  {
    3.10  	GList *dom_node;
    3.11  	GList *addr_node;
    3.12 @@ -65,7 +65,7 @@
    3.13  }
    3.14  
    3.15  static GList*
    3.16 -parse_list(gchar * line)
    3.17 +parse_list(gchar *line)
    3.18  {
    3.19  	GList *list = NULL;
    3.20  	gchar buf[256];
    3.21 @@ -107,14 +107,14 @@
    3.22  addr is assumed to be local and no pipe address nor not-to-expand
    3.23  */
    3.24  static GList*
    3.25 -expand_one(GList* alias_table, address* addr)
    3.26 +expand_one(GList *alias_table, address *addr)
    3.27  {
    3.28  	GList *val_list;
    3.29  	GList *val_node;
    3.30  	GList *alias_list = NULL;
    3.31  	GList *alias_node;
    3.32  	gchar *val;
    3.33 -	address* alias_addr;
    3.34 +	address *alias_addr;
    3.35  
    3.36  	/* expand the local alias */
    3.37  	DEBUG(6) debugf("alias: '%s' is local and will get expanded\n", addr->local_part);
    3.38 @@ -198,7 +198,7 @@
    3.39  }
    3.40  
    3.41  GList*
    3.42 -alias_expand(GList* alias_table, GList* rcpt_list, GList* non_rcpt_list)
    3.43 +alias_expand(GList *alias_table, GList *rcpt_list, GList *non_rcpt_list)
    3.44  {
    3.45  	GList *rcpt_node = NULL;
    3.46  	GList *alias_list = NULL;
     4.1 --- a/src/base64/base64.c	Wed Sep 14 12:20:40 2011 +0200
     4.2 +++ b/src/base64/base64.c	Thu Sep 22 15:07:40 2011 +0200
     4.3 @@ -22,7 +22,7 @@
     4.4  #include "base64.h"
     4.5  
     4.6  gchar*
     4.7 -base64_encode(guchar * buf, gint len)
     4.8 +base64_encode(guchar *buf, gint len)
     4.9  {
    4.10  	guchar *outbuf, *q;
    4.11  	gchar enc[64];
    4.12 @@ -74,7 +74,7 @@
    4.13  	return outbuf;
    4.14  }
    4.15  
    4.16 -gchar *base64_decode(gchar * buf, gint * size)
    4.17 +gchar *base64_decode(gchar *buf, gint *size)
    4.18  {
    4.19  	guchar *p = buf, *q;
    4.20  	guint in[4];
     5.1 --- a/src/base64/base64.h	Wed Sep 14 12:20:40 2011 +0200
     5.2 +++ b/src/base64/base64.h	Thu Sep 22 15:07:40 2011 +0200
     5.3 @@ -15,5 +15,5 @@
     5.4   * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     5.5   */
     5.6  
     5.7 -gchar *base64_encode(guchar * buf, gint len);
     5.8 -gchar *base64_decode(gchar * buf, gint * size);
     5.9 +gchar *base64_encode(guchar *buf, gint len);
    5.10 +gchar *base64_decode(gchar *buf, gint *size);
     6.1 --- a/src/conf.c	Wed Sep 14 12:20:40 2011 +0200
     6.2 +++ b/src/conf.c	Thu Sep 22 15:07:40 2011 +0200
     6.3 @@ -49,7 +49,7 @@
     6.4  	}
     6.5  }
     6.6  
     6.7 -static gchar* true_strings[] = {
     6.8 +static gchar *true_strings[] = {
     6.9  	"yes", "on", "true", NULL
    6.10  };
    6.11  
    6.12 @@ -58,7 +58,7 @@
    6.13  };
    6.14  
    6.15  static gboolean
    6.16 -parse_boolean(gchar * rval)
    6.17 +parse_boolean(gchar *rval)
    6.18  {
    6.19  	gchar **str;
    6.20  
    6.21 @@ -84,7 +84,7 @@
    6.22  
    6.23  /* make a list from each line in a file */
    6.24  static GList*
    6.25 -parse_list_file(gchar * fname)
    6.26 +parse_list_file(gchar *fname)
    6.27  {
    6.28  	GList *list = NULL;
    6.29  	FILE *fptr;
    6.30 @@ -111,7 +111,7 @@
    6.31  
    6.32  /* given a semicolon separated string, this function makes a GList out of it. */
    6.33  GList*
    6.34 -parse_list(gchar * line, gboolean read_file)
    6.35 +parse_list(gchar *line, gboolean read_file)
    6.36  {
    6.37  	GList *list = NULL;
    6.38  	gchar buf[256];
    6.39 @@ -149,7 +149,7 @@
    6.40     We don't need valid RFC821 addresses here, just patterns to match against.
    6.41  */
    6.42  static GList*
    6.43 -parse_address_glob_list(gchar * line, gboolean read_file)
    6.44 +parse_address_glob_list(gchar *line, gboolean read_file)
    6.45  {
    6.46  	GList *plain_list = parse_list(line, read_file);
    6.47  	GList *node;
    6.48 @@ -157,8 +157,8 @@
    6.49  
    6.50  	foreach(plain_list, node) {
    6.51  		gchar *item = (gchar *) (node->data);
    6.52 -		char* at;
    6.53 -		char* p;
    6.54 +		char *at;
    6.55 +		char *p;
    6.56  		address *addr = calloc(1, sizeof(address));
    6.57  
    6.58  		for (p=item+strlen(item)-1; isspace(*p) || *p=='>'; p--) {
    6.59 @@ -188,7 +188,7 @@
    6.60  }
    6.61  
    6.62  static GList*
    6.63 -parse_resolve_list(gchar * line)
    6.64 +parse_resolve_list(gchar *line)
    6.65  {
    6.66  	GList *list;
    6.67  	GList *list_node;
    6.68 @@ -220,7 +220,7 @@
    6.69  }
    6.70  
    6.71  static interface*
    6.72 -parse_interface(gchar * line, gint def_port)
    6.73 +parse_interface(gchar *line, gint def_port)
    6.74  {
    6.75  	gchar buf[256];
    6.76  	gchar *p, *q;
    6.77 @@ -249,7 +249,7 @@
    6.78  
    6.79  #ifdef ENABLE_IDENT  /* so far used for that only */
    6.80  static struct in_addr*
    6.81 -parse_network(gchar * line, gint def_port)
    6.82 +parse_network(gchar *line, gint def_port)
    6.83  {
    6.84  	gchar buf[256];
    6.85  	gchar *p, *q;
    6.86 @@ -292,7 +292,7 @@
    6.87  #endif
    6.88  
    6.89  static gboolean
    6.90 -eat_comments(FILE * in)
    6.91 +eat_comments(FILE *in)
    6.92  {
    6.93  	gint c;
    6.94  
    6.95 @@ -311,7 +311,7 @@
    6.96  
    6.97  /* after parsing, eat trailing character until LF */
    6.98  static gboolean
    6.99 -eat_line_trailing(FILE * in)
   6.100 +eat_line_trailing(FILE *in)
   6.101  {
   6.102  	gint c;
   6.103  
   6.104 @@ -322,7 +322,7 @@
   6.105  }
   6.106  
   6.107  static gboolean
   6.108 -eat_spaces(FILE * in)
   6.109 +eat_spaces(FILE *in)
   6.110  {
   6.111  	gint c;
   6.112  
   6.113 @@ -336,7 +336,7 @@
   6.114  }
   6.115  
   6.116  static gboolean
   6.117 -read_lval(FILE * in, gchar * buf, gint size)
   6.118 +read_lval(FILE *in, gchar *buf, gint size)
   6.119  {
   6.120  	gint c;
   6.121  	gchar *ptr = buf;
   6.122 @@ -373,7 +373,7 @@
   6.123  }
   6.124  
   6.125  static gboolean
   6.126 -read_rval(FILE * in, gchar * buf, gint size)
   6.127 +read_rval(FILE *in, gchar *buf, gint size)
   6.128  {
   6.129  	gint c;
   6.130  	gchar *ptr = buf;
   6.131 @@ -421,7 +421,7 @@
   6.132  }
   6.133  
   6.134  static gboolean
   6.135 -read_statement(FILE * in, gchar * lval, gint lsize, gchar * rval, gint rsize)
   6.136 +read_statement(FILE *in, gchar *lval, gint lsize, gchar *rval, gint rsize)
   6.137  {
   6.138  	gint c;
   6.139  
   6.140 @@ -449,7 +449,7 @@
   6.141  }
   6.142  
   6.143  gboolean
   6.144 -read_conf(gchar * filename)
   6.145 +read_conf(gchar *filename)
   6.146  {
   6.147  	FILE *in;
   6.148  
   6.149 @@ -610,13 +610,13 @@
   6.150  		conf.warn_intervals = parse_list("1h;4h;8h;1d;2d;3d", FALSE);
   6.151  
   6.152  	if (!conf.local_hosts) {
   6.153 -		char* shortname = strdup(conf.host_name);
   6.154 -		char* p = strchr(shortname, '.');
   6.155 +		char *shortname = strdup(conf.host_name);
   6.156 +		char *p = strchr(shortname, '.');
   6.157  		if (p) {
   6.158  			*p = '\0';
   6.159  		}
   6.160  		/* we don't care if shortname and conf.host_name are the same */
   6.161 -		char* local_hosts_str = g_strdup_printf("localhost;%s;%s", shortname, conf.host_name);
   6.162 +		char *local_hosts_str = g_strdup_printf("localhost;%s;%s", shortname, conf.host_name);
   6.163  		conf.local_hosts = parse_list(local_hosts_str, FALSE);
   6.164  		free(shortname);
   6.165  		free(local_hosts_str);
   6.166 @@ -627,7 +627,7 @@
   6.167  }
   6.168  
   6.169  connect_route*
   6.170 -read_route(gchar * filename, gboolean is_perma)
   6.171 +read_route(gchar *filename, gboolean is_perma)
   6.172  {
   6.173  	gboolean ok = FALSE;
   6.174  	FILE *in;
   6.175 @@ -799,7 +799,7 @@
   6.176  }
   6.177  
   6.178  static void
   6.179 -_g_list_free_all(GList * list)
   6.180 +_g_list_free_all(GList *list)
   6.181  {
   6.182  	GList *node;
   6.183  	if (list) {
   6.184 @@ -810,7 +810,7 @@
   6.185  }
   6.186  
   6.187  void
   6.188 -destroy_route(connect_route * r)
   6.189 +destroy_route(connect_route *r)
   6.190  {
   6.191  	if (r->filename)
   6.192  		g_free(r->filename);
   6.193 @@ -850,7 +850,7 @@
   6.194  }
   6.195  
   6.196  GList*
   6.197 -read_route_list(GList * rf_list, gboolean is_perma)
   6.198 +read_route_list(GList *rf_list, gboolean is_perma)
   6.199  {
   6.200  	GList *list = NULL;
   6.201  	GList *node;
   6.202 @@ -878,7 +878,7 @@
   6.203  }
   6.204  
   6.205  void
   6.206 -destroy_route_list(GList * list)
   6.207 +destroy_route_list(GList *list)
   6.208  {
   6.209  	GList *node;
   6.210  
     7.1 --- a/src/connect.c	Wed Sep 14 12:20:40 2011 +0200
     7.2 +++ b/src/connect.c	Thu Sep 22 15:07:40 2011 +0200
     7.3 @@ -18,7 +18,7 @@
     7.4  #include "masqmail.h"
     7.5  
     7.6  static GList*
     7.7 -resolve_ip(GList * list, gchar * ip)
     7.8 +resolve_ip(GList *list, gchar *ip)
     7.9  {
    7.10  	struct in_addr ia;
    7.11  	if (inet_aton(ip, &ia)) {
    7.12 @@ -34,7 +34,7 @@
    7.13  }
    7.14  
    7.15  mxip_addr*
    7.16 -connect_hostlist(int *psockfd, gchar * host, guint port, GList * addr_list)
    7.17 +connect_hostlist(int *psockfd, gchar *host, guint port, GList *addr_list)
    7.18  {
    7.19  	GList *addr_node;
    7.20  	struct sockaddr_in saddr;
    7.21 @@ -86,7 +86,7 @@
    7.22  */
    7.23  
    7.24  mxip_addr*
    7.25 -connect_resolvelist(int *psockfd, gchar * host, guint port, GList * res_func_list)
    7.26 +connect_resolvelist(int *psockfd, gchar *host, guint port, GList *res_func_list)
    7.27  {
    7.28  	GList *res_node;
    7.29  	GList *addr_list;
     8.1 --- a/src/deliver.c	Wed Sep 14 12:20:40 2011 +0200
     8.2 +++ b/src/deliver.c	Thu Sep 22 15:07:40 2011 +0200
     8.3 @@ -27,7 +27,7 @@
     8.4  /* collect failed/defered rcpts for failure/warning messages */
     8.5  /* returns TRUE if either there are no failures or a failure message has been successfully sent */
     8.6  gboolean
     8.7 -delivery_failures(message * msg, GList * rcpt_list, gchar * err_fmt, ...)
     8.8 +delivery_failures(message *msg, GList *rcpt_list, gchar *err_fmt, ...)
     8.9  {
    8.10  	gboolean ok_fail = TRUE, ok_warn = TRUE;
    8.11  	time_t now = time(NULL);
    8.12 @@ -69,7 +69,7 @@
    8.13  }
    8.14  
    8.15  gboolean
    8.16 -deliver_local_mbox(message* msg, GList* hdr_list, address* rcpt, address* env_addr)
    8.17 +deliver_local_mbox(message *msg, GList *hdr_list, address *rcpt, address *env_addr)
    8.18  {
    8.19  	DEBUG(1) debugf("attempting to deliver %s with mbox\n", msg->uid);
    8.20  	if (append_file(msg, hdr_list, rcpt->local_part)) {
    8.21 @@ -92,7 +92,7 @@
    8.22  }
    8.23  
    8.24  gboolean
    8.25 -deliver_local_pipe(message* msg, GList* hdr_list, address* rcpt, address* env_addr)
    8.26 +deliver_local_pipe(message *msg, GList *hdr_list, address *rcpt, address *env_addr)
    8.27  {
    8.28  	guint flags;
    8.29  
    8.30 @@ -117,7 +117,7 @@
    8.31  }
    8.32  
    8.33  gboolean
    8.34 -deliver_local_mda(message* msg, GList* hdr_list, address* rcpt, address* env_addr)
    8.35 +deliver_local_mda(message *msg, GList *hdr_list, address *rcpt, address *env_addr)
    8.36  {
    8.37  	gboolean ok = FALSE;
    8.38  	gchar *cmd = g_malloc(256);
    8.39 @@ -151,7 +151,7 @@
    8.40  }
    8.41  
    8.42  gboolean
    8.43 -deliver_local(msg_out * msgout)
    8.44 +deliver_local(msg_out *msgout)
    8.45  {
    8.46  	message *msg = msgout->msg;
    8.47  	GList *rcpt_list = msgout->rcpt_list;
    8.48 @@ -238,7 +238,7 @@
    8.49  /* make a list of rcpt's of a message that are local
    8.50     return a new copy of the list */
    8.51  void
    8.52 -msg_rcptlist_local(GList * rcpt_list, GList ** p_local_list, GList ** p_nonlocal_list)
    8.53 +msg_rcptlist_local(GList *rcpt_list, GList **p_local_list, GList **p_nonlocal_list)
    8.54  {
    8.55  	GList *rcpt_node;
    8.56  
    8.57 @@ -262,7 +262,7 @@
    8.58  }
    8.59  
    8.60  gboolean
    8.61 -deliver_msglist_host_pipe(connect_route * route, GList * msgout_list, gchar * host, GList * res_list)
    8.62 +deliver_msglist_host_pipe(connect_route *route, GList *msgout_list, gchar *host, GList *res_list)
    8.63  {
    8.64  	gboolean ok = TRUE;
    8.65  	GList *msgout_node;
    8.66 @@ -334,7 +334,7 @@
    8.67     Returns TRUE if at least one msg was delivered to at least one rcpt.
    8.68  */
    8.69  gboolean
    8.70 -deliver_msglist_host_smtp(connect_route * route, GList * msgout_list, gchar * host, GList * res_list)
    8.71 +deliver_msglist_host_smtp(connect_route *route, GList *msgout_list, gchar *host, GList *res_list)
    8.72  {
    8.73  	gboolean ok = FALSE;
    8.74  	GList *msgout_node;
    8.75 @@ -464,7 +464,7 @@
    8.76  }
    8.77  
    8.78  gboolean
    8.79 -deliver_msglist_host(connect_route * route, GList * msgout_list, gchar * host, GList * res_list)
    8.80 +deliver_msglist_host(connect_route *route, GList *msgout_list, gchar *host, GList *res_list)
    8.81  {
    8.82  
    8.83  	if (route->pipe) {
    8.84 @@ -480,7 +480,7 @@
    8.85    delivers messages in msgout_list using route
    8.86  */
    8.87  gboolean
    8.88 -deliver_route_msgout_list(connect_route * route, GList * msgout_list)
    8.89 +deliver_route_msgout_list(connect_route *route, GList *msgout_list)
    8.90  {
    8.91  	gboolean ok = FALSE;
    8.92  	GList *mo_ph_list;
    8.93 @@ -522,7 +522,7 @@
    8.94    delivers messages in msg_list using route by calling deliver_route_msgout_list()
    8.95  */
    8.96  gboolean
    8.97 -deliver_route_msg_list(connect_route * route, GList * msgout_list)
    8.98 +deliver_route_msg_list(connect_route *route, GList *msgout_list)
    8.99  {
   8.100  	GList *msgout_list_deliver = NULL;
   8.101  	GList *msgout_node;
   8.102 @@ -562,8 +562,8 @@
   8.103  		}
   8.104  
   8.105  		/* filter by allowed envelope rcpts */
   8.106 -		GList* rcpt_list_allowed = NULL;
   8.107 -		GList* rcpt_list_notallowed = NULL;
   8.108 +		GList *rcpt_list_allowed = NULL;
   8.109 +		GList *rcpt_list_notallowed = NULL;
   8.110  		route_split_rcpts(route, msgout_cloned->rcpt_list, &rcpt_list_allowed, &rcpt_list_notallowed);
   8.111  		if (!rcpt_list_allowed) {
   8.112  			destroy_msg_out(msgout_cloned);
   8.113 @@ -600,7 +600,7 @@
   8.114     to make sure that they will not be delivered again.
   8.115  */
   8.116  void
   8.117 -update_non_rcpt_list(msg_out * msgout)
   8.118 +update_non_rcpt_list(msg_out *msgout)
   8.119  {
   8.120  	GList *rcpt_node;
   8.121  	message *msg = msgout->msg;
   8.122 @@ -621,7 +621,7 @@
   8.123     returns TRUE if all went well.
   8.124  */
   8.125  gboolean
   8.126 -deliver_finish(msg_out * msgout)
   8.127 +deliver_finish(msg_out *msgout)
   8.128  {
   8.129  	GList *rcpt_node;
   8.130  	message *msg = msgout->msg;
   8.131 @@ -668,7 +668,7 @@
   8.132  }
   8.133  
   8.134  int
   8.135 -deliver_remote(GList* remote_msgout_list)
   8.136 +deliver_remote(GList *remote_msgout_list)
   8.137  {
   8.138  	int ok = TRUE;
   8.139  	GList *route_list = NULL;
   8.140 @@ -732,7 +732,7 @@
   8.141     into local and remote addresses and processes them accordingly.
   8.142  */
   8.143  gboolean
   8.144 -deliver_msg_list(GList * msg_list, guint flags)
   8.145 +deliver_msg_list(GList *msg_list, guint flags)
   8.146  {
   8.147  	GList *msgout_list = NULL;
   8.148  	GList *msg_node;
   8.149 @@ -781,7 +781,7 @@
   8.150  			rcpt_list = aliased_rcpt_list;
   8.151  		}
   8.152  
   8.153 -		/* split_rcpts(rcpt_list, NULL, &local_rcpt_list, * NULL, &other_rcpt_list); */
   8.154 +		/* split_rcpts(rcpt_list, NULL, &local_rcpt_list, NULL, &other_rcpt_list); */
   8.155  		local_rcpt_list = local_rcpts(rcpt_list);
   8.156  		other_rcpt_list = remote_rcpts(rcpt_list);
   8.157  		g_list_free(rcpt_list);
   8.158 @@ -845,7 +845,7 @@
   8.159     deliver then.
   8.160  */
   8.161  gboolean
   8.162 -deliver(message * msg)
   8.163 +deliver(message *msg)
   8.164  {
   8.165  	gboolean ok;
   8.166  	GList *msg_list = g_list_append(NULL, msg);
     9.1 --- a/src/dotlock.c	Wed Sep 14 12:20:40 2011 +0200
     9.2 +++ b/src/dotlock.c	Thu Sep 22 15:07:40 2011 +0200
     9.3 @@ -30,7 +30,7 @@
     9.4  #include "dotlock.h"
     9.5  
     9.6  gboolean
     9.7 -dot_lock(gchar * lock_name, gchar * hitch_name)
     9.8 +dot_lock(gchar *lock_name, gchar *hitch_name)
     9.9  {
    9.10  	gboolean ok = FALSE;
    9.11  	int fd;
    9.12 @@ -72,7 +72,7 @@
    9.13  }
    9.14  
    9.15  gboolean
    9.16 -dot_unlock(gchar * lock_name)
    9.17 +dot_unlock(gchar *lock_name)
    9.18  {
    9.19  	unlink(lock_name);
    9.20  
    10.1 --- a/src/dotlock.h	Wed Sep 14 12:20:40 2011 +0200
    10.2 +++ b/src/dotlock.h	Thu Sep 22 15:07:40 2011 +0200
    10.3 @@ -18,5 +18,5 @@
    10.4  
    10.5  #define MAX_LOCKAGE 300
    10.6  
    10.7 -gboolean dot_lock(gchar * lock_name, gchar * hitch_name);
    10.8 -gboolean dot_unlock(gchar * lock_name);
    10.9 +gboolean dot_lock(gchar *lock_name, gchar *hitch_name);
   10.10 +gboolean dot_unlock(gchar *lock_name);
    11.1 --- a/src/expand.c	Wed Sep 14 12:20:40 2011 +0200
    11.2 +++ b/src/expand.c	Thu Sep 22 15:07:40 2011 +0200
    11.3 @@ -21,7 +21,7 @@
    11.4  #define MAX_VAR 50
    11.5  
    11.6  GList*
    11.7 -var_table_rcpt(GList * var_table, address * rcpt)
    11.8 +var_table_rcpt(GList *var_table, address *rcpt)
    11.9  {
   11.10  	gchar *tmp_str;
   11.11  
   11.12 @@ -36,7 +36,7 @@
   11.13  }
   11.14  
   11.15  GList*
   11.16 -var_table_msg(GList * var_table, message * msg)
   11.17 +var_table_msg(GList *var_table, message *msg)
   11.18  {
   11.19  	address *ret_path = msg->return_path;
   11.20  	gchar *tmp_str;
   11.21 @@ -55,7 +55,7 @@
   11.22  }
   11.23  
   11.24  GList*
   11.25 -var_table_conf(GList * var_table)
   11.26 +var_table_conf(GList *var_table)
   11.27  {
   11.28  	var_table = g_list_prepend(var_table, create_pair_string("host_name", conf.host_name));
   11.29  	var_table = g_list_prepend(var_table, create_pair_string("package", PACKAGE));
   11.30 @@ -65,7 +65,7 @@
   11.31  }
   11.32  
   11.33  gint
   11.34 -expand(GList * var_list, gchar * format, gchar * result, gint result_len)
   11.35 +expand(GList *var_list, gchar *format, gchar *result, gint result_len)
   11.36  {
   11.37  	gchar *p = format, *q = result;
   11.38  	gchar *vq;
    12.1 --- a/src/fail_msg.c	Wed Sep 14 12:20:40 2011 +0200
    12.2 +++ b/src/fail_msg.c	Thu Sep 22 15:07:40 2011 +0200
    12.3 @@ -23,7 +23,7 @@
    12.4  #include "readsock.h"
    12.5  
    12.6  gboolean
    12.7 -fail_msg(message * msg, gchar * template, GList * failed_rcpts, gchar * err_fmt, va_list args)
    12.8 +fail_msg(message *msg, gchar *template, GList *failed_rcpts, gchar *err_fmt, va_list args)
    12.9  {
   12.10  	gboolean ok = FALSE;
   12.11  	address *ret_path = NULL;
   12.12 @@ -130,7 +130,7 @@
   12.13  */
   12.14  
   12.15  static gboolean
   12.16 -warn_msg_is_due(message * msg)
   12.17 +warn_msg_is_due(message *msg)
   12.18  {
   12.19  	time_t now = time(NULL);
   12.20  
   12.21 @@ -155,7 +155,7 @@
   12.22  }
   12.23  
   12.24  gboolean
   12.25 -warn_msg(message * msg, gchar * template, GList * defered_rcpts, gchar * err_fmt, va_list args)
   12.26 +warn_msg(message *msg, gchar *template, GList *defered_rcpts, gchar *err_fmt, va_list args)
   12.27  {
   12.28  	time_t now = time(NULL);
   12.29  
    13.1 --- a/src/header.c	Wed Sep 14 12:20:40 2011 +0200
    13.2 +++ b/src/header.c	Thu Sep 22 15:07:40 2011 +0200
    13.3 @@ -71,7 +71,7 @@
    13.4     else finds all headers matching header
    13.5  */
    13.6  GList*
    13.7 -find_header(GList * hdr_list, header_id id, gchar * hdr_str)
    13.8 +find_header(GList *hdr_list, header_id id, gchar *hdr_str)
    13.9  {
   13.10  	GList *found_list = NULL;
   13.11  	GList *node;
   13.12 @@ -103,7 +103,7 @@
   13.13  }
   13.14  
   13.15  void
   13.16 -header_unfold(header * hdr)
   13.17 +header_unfold(header *hdr)
   13.18  {
   13.19          char *src = hdr->header;
   13.20          char *dest = src;
   13.21 @@ -133,13 +133,13 @@
   13.22     (We exclude the newline because the RFCs deal with it this way)
   13.23  */
   13.24  void
   13.25 -header_fold(header* hdr, unsigned int maxlen)
   13.26 +header_fold(header *hdr, unsigned int maxlen)
   13.27  {
   13.28  	int len = strlen(hdr->header);
   13.29 -	char* src = hdr->header;
   13.30 -	char* dest;
   13.31 -	char* tmp;
   13.32 -	char* p;
   13.33 +	char *src = hdr->header;
   13.34 +	char *dest;
   13.35 +	char *tmp;
   13.36 +	char *p;
   13.37  	int valueoffset;
   13.38  
   13.39  	if (len <= maxlen) {
   13.40 @@ -209,7 +209,7 @@
   13.41  }
   13.42  
   13.43  header*
   13.44 -create_header(header_id id, gchar * fmt, ...)
   13.45 +create_header(header_id id, gchar *fmt, ...)
   13.46  {
   13.47  	gchar *p;
   13.48  	header *hdr;
   13.49 @@ -242,7 +242,7 @@
   13.50  }
   13.51  
   13.52  void
   13.53 -destroy_header(header * hdr)
   13.54 +destroy_header(header *hdr)
   13.55  {
   13.56  	if (hdr) {
   13.57  		if (hdr->header) {
   13.58 @@ -253,7 +253,7 @@
   13.59  }
   13.60  
   13.61  header*
   13.62 -copy_header(header * hdr)
   13.63 +copy_header(header *hdr)
   13.64  {
   13.65  	header *new_hdr = NULL;
   13.66  
   13.67 @@ -267,7 +267,7 @@
   13.68  }
   13.69  
   13.70  header*
   13.71 -get_header(gchar * line)
   13.72 +get_header(gchar *line)
   13.73  {
   13.74  	gchar *p = line;
   13.75  	gchar buf[64], *q = buf;
    14.1 --- a/src/interface.c	Wed Sep 14 12:20:40 2011 +0200
    14.2 +++ b/src/interface.c	Thu Sep 22 15:07:40 2011 +0200
    14.3 @@ -22,7 +22,7 @@
    14.4  /*#define SOCKADDR_OLD 1*/
    14.5  
    14.6  gboolean
    14.7 -init_sockaddr(struct sockaddr_in * name, interface * iface)
    14.8 +init_sockaddr(struct sockaddr_in *name, interface *iface)
    14.9  {
   14.10  	struct hostent *he;
   14.11  	struct in_addr ia;
   14.12 @@ -66,7 +66,7 @@
   14.13  }
   14.14  
   14.15  int
   14.16 -make_server_socket(interface * iface)
   14.17 +make_server_socket(interface *iface)
   14.18  {
   14.19  	int sock = -1;
   14.20  	struct sockaddr_in server;
    15.1 --- a/src/listen.c	Wed Sep 14 12:20:40 2011 +0200
    15.2 +++ b/src/listen.c	Thu Sep 22 15:07:40 2011 +0200
    15.3 @@ -93,7 +93,7 @@
    15.4  }
    15.5  
    15.6  void
    15.7 -listen_port(GList * iface_list, gint qival, char *argv[])
    15.8 +listen_port(GList *iface_list, gint qival, char *argv[])
    15.9  {
   15.10  	int i;
   15.11  	fd_set active_fd_set, read_fd_set;
    16.1 --- a/src/local.c	Wed Sep 14 12:20:40 2011 +0200
    16.2 +++ b/src/local.c	Thu Sep 22 15:07:40 2011 +0200
    16.3 @@ -24,7 +24,7 @@
    16.4  #include "peopen.h"
    16.5  
    16.6  static void
    16.7 -message_stream(FILE * out, message * msg, GList * hdr_list, guint flags)
    16.8 +message_stream(FILE *out, message *msg, GList *hdr_list, guint flags)
    16.9  {
   16.10  	time_t now = time(NULL);
   16.11  	GList *node;
   16.12 @@ -50,7 +50,7 @@
   16.13  }
   16.14  
   16.15  gboolean
   16.16 -append_file(message * msg, GList * hdr_list, gchar * user)
   16.17 +append_file(message *msg, GList *hdr_list, gchar *user)
   16.18  {
   16.19  	struct passwd *pw;
   16.20  	gboolean ok = FALSE;
   16.21 @@ -145,7 +145,7 @@
   16.22  }
   16.23  
   16.24  gboolean
   16.25 -pipe_out(message * msg, GList * hdr_list, address * rcpt, gchar * cmd, guint flags)
   16.26 +pipe_out(message *msg, GList *hdr_list, address *rcpt, gchar *cmd, guint flags)
   16.27  {
   16.28  	gchar *envp[40];
   16.29  	FILE *out;
    17.1 --- a/src/lookup.c	Wed Sep 14 12:20:40 2011 +0200
    17.2 +++ b/src/lookup.c	Thu Sep 22 15:07:40 2011 +0200
    17.3 @@ -122,7 +122,7 @@
    17.4  }
    17.5  
    17.6  static int
    17.7 -dns_getip(guint32 * ip)
    17.8 +dns_getip(guint32 *ip)
    17.9  {
   17.10  	int ret;
   17.11  
   17.12 @@ -167,7 +167,7 @@
   17.13  }
   17.14  
   17.15  int
   17.16 -dns_look_ip(gchar * domain, guint32 * ip)
   17.17 +dns_look_ip(gchar *domain, guint32 *ip)
   17.18  {
   17.19  	gchar *n = domain;
   17.20  
   17.21 @@ -203,7 +203,7 @@
   17.22  }
   17.23  
   17.24  GList*
   17.25 -resolve_dns_a(GList * list, gchar * domain)
   17.26 +resolve_dns_a(GList *list, gchar *domain)
   17.27  {
   17.28  	int ret;
   17.29  
   17.30 @@ -235,7 +235,7 @@
   17.31  }
   17.32  
   17.33  GList*
   17.34 -resolve_dns_mx(GList * list, gchar * domain)
   17.35 +resolve_dns_mx(GList *list, gchar *domain)
   17.36  {
   17.37  	GList *node;
   17.38  	int ret;
   17.39 @@ -286,7 +286,7 @@
   17.40  /* now something completely different... */
   17.41  
   17.42  GList*
   17.43 -resolve_byname(GList * list, gchar * domain)
   17.44 +resolve_byname(GList *list, gchar *domain)
   17.45  {
   17.46  	struct hostent *hent;
   17.47  
    18.1 --- a/src/lookup.h	Wed Sep 14 12:20:40 2011 +0200
    18.2 +++ b/src/lookup.h	Thu Sep 22 15:07:40 2011 +0200
    18.3 @@ -27,7 +27,7 @@
    18.4  
    18.5  typedef GList *(*resolve_func) (GList *, gchar *);
    18.6  
    18.7 -GList *resolve_dns_a(GList * list, gchar * domain);
    18.8 -GList *resolve_dns_mx(GList * list, gchar * domain);
    18.9 -GList *resolve_byname(GList * list, gchar * domain);
   18.10 -int dns_look_ip(gchar * domain, guint32 * ip);
   18.11 +GList *resolve_dns_a(GList *list, gchar *domain);
   18.12 +GList *resolve_dns_mx(GList *list, gchar *domain);
   18.13 +GList *resolve_byname(GList *list, gchar *domain);
   18.14 +int dns_look_ip(gchar *domain, guint32 *ip);
    19.1 --- a/src/masqmail.c	Wed Sep 14 12:20:40 2011 +0200
    19.2 +++ b/src/masqmail.c	Thu Sep 22 15:07:40 2011 +0200
    19.3 @@ -76,7 +76,7 @@
    19.4  
    19.5  #ifdef ENABLE_IDENT  /* so far used for that only */
    19.6  static gboolean
    19.7 -is_in_netlist(gchar * host, GList * netlist)
    19.8 +is_in_netlist(gchar *host, GList *netlist)
    19.9  {
   19.10  	guint hostip = inet_addr(host);
   19.11  	struct in_addr addr;
   19.12 @@ -102,7 +102,7 @@
   19.13               ^          ^
   19.14  */
   19.15  gchar*
   19.16 -get_optarg(char* argv[], gint* argp, char* cp)
   19.17 +get_optarg(char *argv[], gint *argp, char *cp)
   19.18  {
   19.19  	if (*cp) {
   19.20  		/* this kind: -xval */
   19.21 @@ -118,7 +118,7 @@
   19.22  }
   19.23  
   19.24  gboolean
   19.25 -write_pidfile(gchar * name)
   19.26 +write_pidfile(gchar *name)
   19.27  {
   19.28  	FILE *fptr;
   19.29  
   19.30 @@ -204,7 +204,7 @@
   19.31  
   19.32  /* default mode if address args or -t is specified, or called as rmail */
   19.33  static void
   19.34 -mode_accept(address * return_path, gchar * full_sender_name, guint accept_flags, char **addresses, int addr_cnt)
   19.35 +mode_accept(address *return_path, gchar *full_sender_name, guint accept_flags, char **addresses, int addr_cnt)
   19.36  {
   19.37  	/* accept message on stdin */
   19.38  	accept_error err;
   19.39 @@ -312,7 +312,7 @@
   19.40  return success if at least one message had been deleted
   19.41  */
   19.42  static int
   19.43 -manipulate_queue(char* cmd, char* id[])
   19.44 +manipulate_queue(char *cmd, char *id[])
   19.45  {
   19.46  	gboolean ok = FALSE;
   19.47  
   19.48 @@ -372,7 +372,7 @@
   19.49  
   19.50  /* -qo, -q (without argument), or called as runq */
   19.51  static int
   19.52 -run_queue(gboolean do_runq, gboolean do_runq_online, char* route_name)
   19.53 +run_queue(gboolean do_runq, gboolean do_runq_online, char *route_name)
   19.54  {
   19.55  	int ret;
   19.56  
   19.57 @@ -431,7 +431,7 @@
   19.58  main(int argc, char *argv[])
   19.59  {
   19.60  	gchar *progname;
   19.61 -	char* opt;
   19.62 +	char *opt;
   19.63  	gint arg;
   19.64  
   19.65  	gboolean do_listen = FALSE;
    20.1 --- a/src/masqmail.h	Wed Sep 14 12:20:40 2011 +0200
    20.2 +++ b/src/masqmail.h	Thu Sep 22 15:07:40 2011 +0200
    20.3 @@ -333,106 +333,106 @@
    20.4  } smtp_connection;
    20.5  
    20.6  /* alias.c*/
    20.7 -gboolean addr_is_local(address * addr);
    20.8 -GList *alias_expand(GList * alias_table, GList * rcpt_list, GList * non_rcpt_list);
    20.9 +gboolean addr_is_local(address *addr);
   20.10 +GList *alias_expand(GList *alias_table, GList *rcpt_list, GList *non_rcpt_list);
   20.11  
   20.12  /* child.c */
   20.13  int child(const char *command);
   20.14  
   20.15  /* conf.c */
   20.16  void init_conf();
   20.17 -gboolean read_conf(gchar * filename);
   20.18 -connect_route *read_route(gchar * filename, gboolean is_perma);
   20.19 -GList *read_route_list(GList * rf_list, gboolean is_perma);
   20.20 -void destroy_route(connect_route * r);
   20.21 -void destroy_route_list(GList * list);
   20.22 +gboolean read_conf(gchar *filename);
   20.23 +connect_route *read_route(gchar *filename, gboolean is_perma);
   20.24 +GList *read_route_list(GList *rf_list, gboolean is_perma);
   20.25 +void destroy_route(connect_route *r);
   20.26 +void destroy_route_list(GList *list);
   20.27  
   20.28  /* expand.c */
   20.29 -GList *var_table_rcpt(GList * var_table, address * rcpt);
   20.30 -GList *var_table_msg(GList * var_table, message * msg);
   20.31 -GList *var_table_conf(GList * var_table);
   20.32 -gint expand(GList * var_list, gchar * format, gchar * result, gint result_len);
   20.33 +GList *var_table_rcpt(GList *var_table, address *rcpt);
   20.34 +GList *var_table_msg(GList *var_table, message *msg);
   20.35 +GList *var_table_conf(GList *var_table);
   20.36 +gint expand(GList *var_list, gchar *format, gchar *result, gint result_len);
   20.37  
   20.38  /* message.c */
   20.39  message *create_message(void);
   20.40 -void destroy_message(message * msg);
   20.41 -void destroy_msg_list(GList * msg_list);
   20.42 -void msg_free_data(message * msg);
   20.43 -gint msg_calc_size(message * msg, gboolean is_smtp);
   20.44 +void destroy_message(message *msg);
   20.45 +void destroy_msg_list(GList *msg_list);
   20.46 +void msg_free_data(message *msg);
   20.47 +gint msg_calc_size(message *msg, gboolean is_smtp);
   20.48  
   20.49 -msg_out *create_msg_out(message * msg);
   20.50 -msg_out *clone_msg_out(msg_out * msgout_orig);
   20.51 -void destroy_msg_out(msg_out * msgout);
   20.52 -void destroy_msg_out_list(GList * msgout_list);
   20.53 +msg_out *create_msg_out(message *msg);
   20.54 +msg_out *clone_msg_out(msg_out *msgout_orig);
   20.55 +void destroy_msg_out(msg_out *msgout);
   20.56 +void destroy_msg_out_list(GList *msgout_list);
   20.57  
   20.58  /* address.c */
   20.59 -address *create_address(gchar * path, gboolean is_rfc821);
   20.60 -address *create_address_qualified(gchar * path, gboolean is_rfc821, gchar * domain);
   20.61 -address *create_address_pipe(gchar * path);
   20.62 -void destroy_address(address * addr);
   20.63 -address *copy_modify_address(const address * orig, gchar * l_part, gchar * dom);
   20.64 +address *create_address(gchar *path, gboolean is_rfc821);
   20.65 +address *create_address_qualified(gchar *path, gboolean is_rfc821, gchar *domain);
   20.66 +address *create_address_pipe(gchar *path);
   20.67 +void destroy_address(address *addr);
   20.68 +address *copy_modify_address(const address *orig, gchar *l_part, gchar *dom);
   20.69  #define copy_address(addr) copy_modify_address(addr, NULL, NULL)
   20.70 -gboolean addr_isequal(address * addr1, address * addr2, int (*cmpfunc) (const char*, const char*));
   20.71 -gboolean addr_isequal_parent(address * addr1, address * addr2, int (*cmpfunc) (const char*, const char*));
   20.72 -address *addr_find_ancestor(address * addr);
   20.73 -gboolean addr_is_delivered_children(address * addr);
   20.74 -gboolean addr_is_finished_children(address * addr);
   20.75 -gchar *addr_string(address * addr);
   20.76 +gboolean addr_isequal(address *addr1, address *addr2, int (*cmpfunc) (const char*, const char*));
   20.77 +gboolean addr_isequal_parent(address *addr1, address *addr2, int (*cmpfunc) (const char*, const char*));
   20.78 +address *addr_find_ancestor(address *addr);
   20.79 +gboolean addr_is_delivered_children(address *addr);
   20.80 +gboolean addr_is_finished_children(address *addr);
   20.81 +gchar *addr_string(address *addr);
   20.82  
   20.83  /* accept.c */
   20.84 -accept_error accept_message(FILE * in, message * msg, guint flags);
   20.85 -accept_error accept_message_prepare(message * msg, guint flags);
   20.86 +accept_error accept_message(FILE *in, message *msg, guint flags);
   20.87 +accept_error accept_message_prepare(message *msg, guint flags);
   20.88  
   20.89  /* header.c */
   20.90  gchar *rec_timestamp();
   20.91 -GList *find_header(GList * hdr_list, header_id id, gchar * hdr_str);
   20.92 -void header_unfold(header * hdr);
   20.93 -void header_fold(header * hdr, unsigned int maxlen);
   20.94 -header *create_header(header_id id, gchar * fmt, ...);
   20.95 -void destroy_header(header * hdr);
   20.96 -header *copy_header(header * hdr);
   20.97 -header *get_header(gchar * line);
   20.98 +GList *find_header(GList *hdr_list, header_id id, gchar *hdr_str);
   20.99 +void header_unfold(header *hdr);
  20.100 +void header_fold(header *hdr, unsigned int maxlen);
  20.101 +header *create_header(header_id id, gchar *fmt, ...);
  20.102 +void destroy_header(header *hdr);
  20.103 +header *copy_header(header *hdr);
  20.104 +header *get_header(gchar *line);
  20.105  
  20.106  /* smtp_in.c */
  20.107 -void smtp_in(FILE * in, FILE * out, gchar * remote_host, gchar * ident);
  20.108 +void smtp_in(FILE *in, FILE *out, gchar *remote_host, gchar *ident);
  20.109  
  20.110  /* listen.c */
  20.111 -void listen_port(GList * addr_list, gint qival, char *argv[]);
  20.112 +void listen_port(GList *addr_list, gint qival, char *argv[]);
  20.113  
  20.114  /* parse.c */
  20.115 -gboolean split_address(const gchar * path, gchar ** local_part, gchar ** domain, gboolean is_rfc821);
  20.116 -gboolean parse_address_rfc822(gchar * string, gchar ** local_begin, gchar ** local_end, gchar ** domain_begin, gchar ** domain_end, gchar ** address_end);
  20.117 -gboolean parse_address_rfc821(gchar * string, gchar ** local_begin, gchar ** local_end, gchar ** domain_begin, gchar ** domain_end, gchar ** address_end);
  20.118 -address *_create_address(gchar * string, gchar ** end, gboolean is_rfc821);
  20.119 -address *create_address_rfc821(gchar * string, gchar ** end);
  20.120 -address *create_address_rfc822(gchar * string, gchar ** end);
  20.121 -GList *addr_list_append_rfc822(GList * addr_list, gchar * string, gchar * domain);
  20.122 +gboolean split_address(const gchar *path, gchar **local_part, gchar **domain, gboolean is_rfc821);
  20.123 +gboolean parse_address_rfc822(gchar *string, gchar **local_begin, gchar **local_end, gchar **domain_begin, gchar **domain_end, gchar **address_end);
  20.124 +gboolean parse_address_rfc821(gchar *string, gchar **local_begin, gchar **local_end, gchar **domain_begin, gchar **domain_end, gchar **address_end);
  20.125 +address *_create_address(gchar *string, gchar **end, gboolean is_rfc821);
  20.126 +address *create_address_rfc821(gchar *string, gchar **end);
  20.127 +address *create_address_rfc822(gchar *string, gchar **end);
  20.128 +GList *addr_list_append_rfc822(GList *addr_list, gchar *string, gchar *domain);
  20.129  
  20.130  /* connect.c */
  20.131 -mxip_addr *connect_hostlist(int *psockfd, gchar * host, guint port, GList * addr_list);
  20.132 -mxip_addr *connect_resolvelist(int *psockfd, gchar * host, guint port, GList * res_funcs);
  20.133 +mxip_addr *connect_hostlist(int *psockfd, gchar *host, guint port, GList *addr_list);
  20.134 +mxip_addr *connect_resolvelist(int *psockfd, gchar *host, guint port, GList *res_funcs);
  20.135  
  20.136  /* deliver.c */
  20.137 -void msg_rcptlist_local(GList * rcpt_list, GList **, GList **);
  20.138 -gboolean deliver_local(msg_out * msgout);
  20.139 -gboolean deliver_msglist_host(connect_route * route, GList * msg_list, gchar * host, GList * res_list);
  20.140 -gboolean deliver_route_msgout_list(connect_route * route, GList * msgout_list);
  20.141 -gboolean deliver_route_msg_list(connect_route * route, GList * msgout_list);
  20.142 -gboolean deliver_finish(msg_out * msgout);
  20.143 -gboolean deliver_msg_list(GList * msg_list, guint flags);
  20.144 -gboolean deliver(message * msg);
  20.145 +void msg_rcptlist_local(GList *rcpt_list, GList **, GList **);
  20.146 +gboolean deliver_local(msg_out *msgout);
  20.147 +gboolean deliver_msglist_host(connect_route *route, GList *msg_list, gchar *host, GList *res_list);
  20.148 +gboolean deliver_route_msgout_list(connect_route *route, GList *msgout_list);
  20.149 +gboolean deliver_route_msg_list(connect_route *route, GList *msgout_list);
  20.150 +gboolean deliver_finish(msg_out *msgout);
  20.151 +gboolean deliver_msg_list(GList *msg_list, guint flags);
  20.152 +gboolean deliver(message *msg);
  20.153  
  20.154  /* fail_msg.c */
  20.155 -gboolean fail_msg(message * msg, gchar * template, GList * failed_rcpts, gchar * err_fmt, va_list args);
  20.156 -gboolean warn_msg(message * msg, gchar * template, GList * failed_rcpts, gchar * err_fmt, va_list args);
  20.157 +gboolean fail_msg(message *msg, gchar *template, GList *failed_rcpts, gchar *err_fmt, va_list args);
  20.158 +gboolean warn_msg(message *msg, gchar *template, GList *failed_rcpts, gchar *err_fmt, va_list args);
  20.159  
  20.160  /* interface.c */
  20.161 -gboolean init_sockaddr(struct sockaddr_in *name, interface * iface);
  20.162 -int make_server_socket(interface * iface);
  20.163 +gboolean init_sockaddr(struct sockaddr_in *name, interface *iface);
  20.164 +int make_server_socket(interface *iface);
  20.165  
  20.166  /* local.c */
  20.167 -gboolean append_file(message * msg, GList * hdr_list, gchar * user);
  20.168 -gboolean pipe_out(message * msg, GList * hdr_list, address * rcpt, gchar * cmd, guint flags);
  20.169 +gboolean append_file(message *msg, GList *hdr_list, gchar *user);
  20.170 +gboolean pipe_out(message *msg, GList *hdr_list, address *rcpt, gchar *cmd, guint flags);
  20.171  
  20.172  /* log.c */
  20.173  gchar *ext_strerror(int err);
  20.174 @@ -445,58 +445,58 @@
  20.175  void maillog(const char *fmt, ...);
  20.176  
  20.177  /* spool.c */
  20.178 -gboolean spool_read_data(message * msg);
  20.179 -message *msg_spool_read(gchar * uid);
  20.180 -gboolean spool_write(message * msg, gboolean do_writedata);
  20.181 -gboolean spool_lock(gchar * uid);
  20.182 -gboolean spool_unlock(gchar * uid);
  20.183 -gboolean spool_delete_all(message * msg);
  20.184 +gboolean spool_read_data(message *msg);
  20.185 +message *msg_spool_read(gchar *uid);
  20.186 +gboolean spool_write(message *msg, gboolean do_writedata);
  20.187 +gboolean spool_lock(gchar *uid);
  20.188 +gboolean spool_unlock(gchar *uid);
  20.189 +gboolean spool_delete_all(message *msg);
  20.190  
  20.191  /* queue.c */
  20.192  GList *read_queue(void);
  20.193  gboolean queue_run(void);
  20.194  gboolean queue_run_online(void);
  20.195  void queue_list(void);
  20.196 -gboolean queue_delete(gchar * uid);
  20.197 +gboolean queue_delete(gchar *uid);
  20.198  
  20.199  /* online.c */
  20.200  gchar *online_query();
  20.201  
  20.202  /* permissions.c */
  20.203  gboolean is_ingroup(uid_t uid, gid_t gid);
  20.204 -void set_euidgid(gint uid, gint gid, uid_t * old_uid, gid_t * old_gid);
  20.205 -void set_identity(uid_t old_uid, gchar * task_name);
  20.206 +void set_euidgid(gint uid, gint gid, uid_t *old_uid, gid_t *old_gid);
  20.207 +void set_identity(uid_t old_uid, gchar *task_name);
  20.208  
  20.209  /* rewrite.c */
  20.210 -gboolean set_address_header_domain(header * hdr, gchar * domain);
  20.211 -gboolean map_address_header(header * hdr, GList * table);
  20.212 +gboolean set_address_header_domain(header *hdr, gchar *domain);
  20.213 +gboolean map_address_header(header *hdr, GList *table);
  20.214  
  20.215  /* route.c */
  20.216 -msgout_perhost *create_msgout_perhost(gchar * host);
  20.217 -void destroy_msgout_perhost(msgout_perhost * mo_ph);
  20.218 -void rewrite_headers(msg_out * msgout, connect_route * route);
  20.219 -void split_rcpts(GList* rcpt_list, GList* localnets, GList** rl_local, GList** rl_localnet, GList** rl_others);
  20.220 -GList* local_rcpts(GList* rcpt_list);
  20.221 -GList* remote_rcpts(GList* rcpt_list);
  20.222 -gboolean route_strip_msgout(connect_route * route, msg_out * msgout);
  20.223 -msg_out *route_prepare_msgout(connect_route * route, msg_out * msgout);
  20.224 -GList *route_msgout_list(connect_route * route, GList * msgout_list);
  20.225 -gboolean route_sender_is_allowed(connect_route * route, address * ret_path);
  20.226 -void route_split_rcpts(connect_route * route, GList * rcpt_list, GList ** p_rcpt_list, GList ** p_non_rcpt_list);
  20.227 +msgout_perhost *create_msgout_perhost(gchar *host);
  20.228 +void destroy_msgout_perhost(msgout_perhost *mo_ph);
  20.229 +void rewrite_headers(msg_out *msgout, connect_route *route);
  20.230 +void split_rcpts(GList *rcpt_list, GList *localnets, GList **rl_local, GList **rl_localnet, GList **rl_others);
  20.231 +GList *local_rcpts(GList *rcpt_list);
  20.232 +GList *remote_rcpts(GList *rcpt_list);
  20.233 +gboolean route_strip_msgout(connect_route *route, msg_out *msgout);
  20.234 +msg_out *route_prepare_msgout(connect_route *route, msg_out *msgout);
  20.235 +GList *route_msgout_list(connect_route *route, GList *msgout_list);
  20.236 +gboolean route_sender_is_allowed(connect_route *route, address *ret_path);
  20.237 +void route_split_rcpts(connect_route *route, GList *rcpt_list, GList **p_rcpt_list, GList **p_non_rcpt_list);
  20.238  
  20.239  /* tables.c */
  20.240 -table_pair *create_pair(gchar * key, gpointer value);
  20.241 -table_pair *create_pair_string(gchar * key, gpointer value);
  20.242 -table_pair *parse_table_pair(gchar * line, char delim);
  20.243 -gpointer *table_find_func(GList * table_list, gchar * key, int (*cmp_func) (const char *, const char *));
  20.244 -gpointer *table_find(GList * table_list, gchar * key);
  20.245 -gpointer *table_find_case(GList * table_list, gchar * key);
  20.246 -gpointer *table_find_fnmatch(GList * table_list, gchar * key);
  20.247 -GList *table_read(gchar * fname, gchar delim);
  20.248 -void destroy_table(GList * table);
  20.249 +table_pair *create_pair(gchar *key, gpointer value);
  20.250 +table_pair *create_pair_string(gchar *key, gpointer value);
  20.251 +table_pair *parse_table_pair(gchar *line, char delim);
  20.252 +gpointer *table_find_func(GList *table_list, gchar *key, int (*cmp_func) (const char *, const char *));
  20.253 +gpointer *table_find(GList *table_list, gchar *key);
  20.254 +gpointer *table_find_case(GList *table_list, gchar *key);
  20.255 +gpointer *table_find_fnmatch(GList *table_list, gchar *key);
  20.256 +GList *table_read(gchar *fname, gchar delim);
  20.257 +void destroy_table(GList *table);
  20.258  
  20.259  /* timeival.c */
  20.260 -gint time_interval(gchar * str);
  20.261 +gint time_interval(gchar *str);
  20.262  
  20.263  /* permissions.c */
  20.264  gboolean is_privileged_user(uid_t uid);
    21.1 --- a/src/md5/hmac_md5.c	Wed Sep 14 12:20:40 2011 +0200
    21.2 +++ b/src/md5/hmac_md5.c	Thu Sep 22 15:07:40 2011 +0200
    21.3 @@ -40,7 +40,7 @@
    21.4  Ensure digest points to hashsize bytes of allocated memory.
    21.5  */
    21.6  void
    21.7 -hmac_md5(unsigned char* text, int textlen, unsigned char* key, int keylen, unsigned char* digest)
    21.8 +hmac_md5(unsigned char *text, int textlen, unsigned char *key, int keylen, unsigned char *digest)
    21.9  {
   21.10  	int i;
   21.11  	MD5_CTX context;
    22.1 --- a/src/md5/hmac_md5.h	Wed Sep 14 12:20:40 2011 +0200
    22.2 +++ b/src/md5/hmac_md5.h	Thu Sep 22 15:07:40 2011 +0200
    22.3 @@ -1,7 +1,7 @@
    22.4  void hmac_md5(
    22.5 -	unsigned char* text,   /* pointer to the message */
    22.6 +	unsigned char *text,   /* pointer to the message */
    22.7  	int textlen,           /* length of the message */
    22.8 -	unsigned char* key,    /* pointer to the authentication key */
    22.9 +	unsigned char *key,    /* pointer to the authentication key */
   22.10  	int keylen,            /* length of the key */
   22.11 -	unsigned char* digest  /* pointer to allocated memory to store the computed HMAC */
   22.12 +	unsigned char *digest  /* pointer to allocated memory to store the computed HMAC */
   22.13  );
    23.1 --- a/src/md5/hmactest.c	Wed Sep 14 12:20:40 2011 +0200
    23.2 +++ b/src/md5/hmactest.c	Thu Sep 22 15:07:40 2011 +0200
    23.3 @@ -62,7 +62,7 @@
    23.4  	puts("---- Following are the test vectors from RFC 2104");
    23.5  
    23.6  
    23.7 -	char* d01 = "Hi There";
    23.8 +	char *d01 = "Hi There";
    23.9  	char k01[16];
   23.10  	for (i=0; i<16; i++) {
   23.11  		k01[i] = 0x0b;
   23.12 @@ -75,8 +75,8 @@
   23.13  	printf(" (was computed)\n\n");
   23.14  
   23.15  
   23.16 -	char* d02 = "what do ya want for nothing?";
   23.17 -	char* k02 = "Jefe";
   23.18 +	char *d02 = "what do ya want for nothing?";
   23.19 +	char *k02 = "Jefe";
   23.20  	printf("750c783e6ab0b503eaa86e310a5db738 (should be)\n");
   23.21  	hmac_md5(d02, strlen(d02), k02, strlen(k02), digest);
   23.22  	for (i = 0; i < 16; i++) {
    24.1 --- a/src/message.c	Wed Sep 14 12:20:40 2011 +0200
    24.2 +++ b/src/message.c	Thu Sep 22 15:07:40 2011 +0200
    24.3 @@ -46,7 +46,7 @@
    24.4     internal format. Dot-stuffing is ignored in the size.
    24.5  */
    24.6  gint
    24.7 -msg_calc_size(message * msg, gboolean is_smtp)
    24.8 +msg_calc_size(message *msg, gboolean is_smtp)
    24.9  {
   24.10  	GList *node;
   24.11  	gint l_cnt = 0;  /* line count (we need to add so many '\r' for SMTP) */
   24.12 @@ -91,7 +91,7 @@
   24.13  }
   24.14  
   24.15  void
   24.16 -msg_free_data(message * msg)
   24.17 +msg_free_data(message *msg)
   24.18  {
   24.19  	GList *node;
   24.20  
   24.21 @@ -106,7 +106,7 @@
   24.22  }
   24.23  
   24.24  void
   24.25 -destroy_message(message * msg)
   24.26 +destroy_message(message *msg)
   24.27  {
   24.28  	GList *node;
   24.29  
   24.30 @@ -149,7 +149,7 @@
   24.31  }
   24.32  
   24.33  void
   24.34 -destroy_msg_list(GList * msg_list)
   24.35 +destroy_msg_list(GList *msg_list)
   24.36  {
   24.37  	GList *msg_node;
   24.38  
   24.39 @@ -161,7 +161,7 @@
   24.40  }
   24.41  
   24.42  msg_out*
   24.43 -create_msg_out(message * msg)
   24.44 +create_msg_out(message *msg)
   24.45  {
   24.46  	msg_out *msgout = g_malloc0(sizeof(msg_out));
   24.47  	msgout->msg = msg;
   24.48 @@ -169,7 +169,7 @@
   24.49  }
   24.50  
   24.51  msg_out*
   24.52 -clone_msg_out(msg_out * msgout_orig)
   24.53 +clone_msg_out(msg_out *msgout_orig)
   24.54  {
   24.55  	if (msgout_orig) {
   24.56  		msg_out *msgout = create_msg_out(msgout_orig->msg);
   24.57 @@ -192,7 +192,7 @@
   24.58  }
   24.59  
   24.60  void
   24.61 -destroy_msg_out(msg_out * msgout)
   24.62 +destroy_msg_out(msg_out *msgout)
   24.63  {
   24.64  	if (msgout) {
   24.65  		if (msgout->return_path)
   24.66 @@ -212,7 +212,7 @@
   24.67  }
   24.68  
   24.69  void
   24.70 -destroy_msg_out_list(GList * msgout_list)
   24.71 +destroy_msg_out_list(GList *msgout_list)
   24.72  {
   24.73  	GList *msgout_node;
   24.74  
    25.1 --- a/src/mservdetect.c	Wed Sep 14 12:20:40 2011 +0200
    25.2 +++ b/src/mservdetect.c	Thu Sep 22 15:07:40 2011 +0200
    25.3 @@ -23,7 +23,7 @@
    25.4  
    25.5  
    25.6  gboolean
    25.7 -init_sockaddr2(struct sockaddr_in * name, gchar* addr, int port)
    25.8 +init_sockaddr2(struct sockaddr_in *name, gchar *addr, int port)
    25.9  {
   25.10  	struct hostent *he;
   25.11  	struct in_addr ia;
   25.12 @@ -46,7 +46,7 @@
   25.13  
   25.14  
   25.15  gchar*
   25.16 -mserver_detect_online(gchar* addr, int port)
   25.17 +mserver_detect_online(gchar *addr, int port)
   25.18  {
   25.19  	struct sockaddr_in saddr;
   25.20  	gchar *ret = NULL;
   25.21 @@ -128,7 +128,7 @@
   25.22  int
   25.23  main(int argc, char *argv[])
   25.24  {
   25.25 -	gchar* addr;
   25.26 +	gchar *addr;
   25.27  	int port;
   25.28  	gchar *name;
   25.29  
    26.1 --- a/src/online.c	Wed Sep 14 12:20:40 2011 +0200
    26.2 +++ b/src/online.c	Thu Sep 22 15:07:40 2011 +0200
    26.3 @@ -26,7 +26,7 @@
    26.4  gchar*
    26.5  online_query()
    26.6  {
    26.7 -	gchar* pipe = conf.online_query;
    26.8 +	gchar *pipe = conf.online_query;
    26.9  	pid_t pid;
   26.10  	void (*old_signal) (int);
   26.11  	int status;
    27.1 --- a/src/parse.c	Wed Sep 14 12:20:40 2011 +0200
    27.2 +++ b/src/parse.c	Thu Sep 22 15:07:40 2011 +0200
    27.3 @@ -35,7 +35,7 @@
    27.4  char *parse_error = NULL;
    27.5  
    27.6  static gchar*
    27.7 -skip_comment(gchar * p)
    27.8 +skip_comment(gchar *p)
    27.9  {
   27.10  
   27.11  #ifdef PARSE_TEST
   27.12 @@ -55,7 +55,7 @@
   27.13  }
   27.14  
   27.15  static gboolean
   27.16 -read_word(gchar * p, gchar ** b, gchar ** e)
   27.17 +read_word(gchar *p, gchar **b, gchar **e)
   27.18  {
   27.19  #ifdef PARSE_TEST
   27.20  	g_print("read_word: %s\n", p);
   27.21 @@ -85,7 +85,7 @@
   27.22  }
   27.23  
   27.24  static gboolean
   27.25 -read_word_with_dots(gchar * p, gchar ** b, gchar ** e)
   27.26 +read_word_with_dots(gchar *p, gchar **b, gchar **e)
   27.27  {
   27.28  	gchar *b0 = p;
   27.29  
   27.30 @@ -108,7 +108,7 @@
   27.31  }
   27.32  
   27.33  static gboolean
   27.34 -read_domain(gchar * p, gchar ** b, gchar ** e)
   27.35 +read_domain(gchar *p, gchar **b, gchar **e)
   27.36  {
   27.37  #ifdef PARSE_TEST
   27.38  	g_print("read_domain: %s\n", p);
   27.39 @@ -134,8 +134,8 @@
   27.40  }
   27.41  
   27.42  gboolean
   27.43 -parse_address_rfc822(gchar* string, gchar** local_begin, gchar** local_end, gchar** domain_begin,
   27.44 -                     gchar** domain_end, gchar** address_end)
   27.45 +parse_address_rfc822(gchar *string, gchar **local_begin, gchar **local_end, gchar **domain_begin,
   27.46 +                     gchar **domain_end, gchar **address_end)
   27.47  {
   27.48  	gint angle_brackets = 0;
   27.49  
   27.50 @@ -284,8 +284,8 @@
   27.51  }
   27.52  
   27.53  gboolean
   27.54 -parse_address_rfc821(gchar* string, gchar** local_begin, gchar** local_end, gchar** domain_begin,
   27.55 -                     gchar** domain_end, gchar** address_end)
   27.56 +parse_address_rfc821(gchar *string, gchar **local_begin, gchar **local_end, gchar **domain_begin,
   27.57 +                     gchar **domain_end, gchar **address_end)
   27.58  {
   27.59  	gint angle_brackets = 0;
   27.60  
   27.61 @@ -379,7 +379,7 @@
   27.62    parses both rfc 821 and rfc 822 addresses, depending on flag is_rfc821
   27.63  */
   27.64  address*
   27.65 -_create_address(gchar * string, gchar ** end, gboolean is_rfc821)
   27.66 +_create_address(gchar *string, gchar **end, gboolean is_rfc821)
   27.67  {
   27.68  	gchar *loc_beg, *loc_end;
   27.69  	gchar *dom_beg, *dom_end;
   27.70 @@ -448,19 +448,19 @@
   27.71  }
   27.72  
   27.73  address*
   27.74 -create_address_rfc822(gchar * string, gchar ** end)
   27.75 +create_address_rfc822(gchar *string, gchar **end)
   27.76  {
   27.77  	return _create_address(string, end, FALSE);
   27.78  }
   27.79  
   27.80  address*
   27.81 -create_address_rfc821(gchar * string, gchar ** end)
   27.82 +create_address_rfc821(gchar *string, gchar **end)
   27.83  {
   27.84  	return _create_address(string, end, TRUE);
   27.85  }
   27.86  
   27.87  GList*
   27.88 -addr_list_append_rfc822(GList * addr_list, gchar * string, gchar * domain)
   27.89 +addr_list_append_rfc822(GList *addr_list, gchar *string, gchar *domain)
   27.90  {
   27.91  	gchar *p = string;
   27.92  	gchar *end;
    28.1 --- a/src/permissions.c	Wed Sep 14 12:20:40 2011 +0200
    28.2 +++ b/src/permissions.c	Thu Sep 22 15:07:40 2011 +0200
    28.3 @@ -53,7 +53,7 @@
    28.4  is_privileged_user(uid_t uid)
    28.5  {
    28.6  	/* uncomment these lines if you need the `uucp' group to be trusted too
    28.7 -	struct group* grent = getgrnam("uucp");
    28.8 +	struct group *grent = getgrnam("uucp");
    28.9  
   28.10  	if (is_ingroup(uid, grent->gr_gid)) {
   28.11  		return TRUE;
   28.12 @@ -64,7 +64,7 @@
   28.13  }
   28.14  
   28.15  void
   28.16 -set_euidgid(gint uid, gint gid, uid_t * old_uid, gid_t * old_gid)
   28.17 +set_euidgid(gint uid, gint gid, uid_t *old_uid, gid_t *old_gid)
   28.18  {
   28.19  	if (old_uid)
   28.20  		*old_uid = geteuid();
   28.21 @@ -84,7 +84,7 @@
   28.22  }
   28.23  
   28.24  void
   28.25 -set_identity(uid_t old_uid, gchar * task_name)
   28.26 +set_identity(uid_t old_uid, gchar *task_name)
   28.27  {
   28.28  	if (!conf.run_as_user) {
   28.29  		if (!is_privileged_user(old_uid)) {
    29.1 --- a/src/queue.c	Wed Sep 14 12:20:40 2011 +0200
    29.2 +++ b/src/queue.c	Thu Sep 22 15:07:40 2011 +0200
    29.3 @@ -189,7 +189,7 @@
    29.4  }
    29.5  
    29.6  gboolean
    29.7 -queue_delete(gchar * uid)
    29.8 +queue_delete(gchar *uid)
    29.9  {
   29.10  	gboolean hdr_ok = TRUE;
   29.11  	gboolean dat_ok = TRUE;
    30.1 --- a/src/readsock.c	Wed Sep 14 12:20:40 2011 +0200
    30.2 +++ b/src/readsock.c	Thu Sep 22 15:07:40 2011 +0200
    30.3 @@ -59,7 +59,7 @@
    30.4  }
    30.5  
    30.6  static void
    30.7 -_read_chug(FILE * in)
    30.8 +_read_chug(FILE *in)
    30.9  {
   30.10  	int c = 0;
   30.11  
   30.12 @@ -70,7 +70,7 @@
   30.13  }
   30.14  
   30.15  static int
   30.16 -_read_line(FILE * in, char *buf, int buf_len, int timeout)
   30.17 +_read_line(FILE *in, char *buf, int buf_len, int timeout)
   30.18  {
   30.19  	int p = 0;
   30.20  	int c = 0;
   30.21 @@ -97,7 +97,7 @@
   30.22  }
   30.23  
   30.24  int
   30.25 -read_sockline(FILE * in, char *buf, int buf_len, int timeout, unsigned int flags)
   30.26 +read_sockline(FILE *in, char *buf, int buf_len, int timeout, unsigned int flags)
   30.27  {
   30.28  	int p = 0;
   30.29  
   30.30 @@ -131,7 +131,7 @@
   30.31  }
   30.32  
   30.33  int
   30.34 -read_sockline1(FILE * in, char **pbuf, int *buf_len, int timeout, unsigned int flags)
   30.35 +read_sockline1(FILE *in, char **pbuf, int *buf_len, int timeout, unsigned int flags)
   30.36  {
   30.37  	int p = 0, size = *buf_len;
   30.38  	char *buf;
    31.1 --- a/src/readsock.h	Wed Sep 14 12:20:40 2011 +0200
    31.2 +++ b/src/readsock.h	Thu Sep 22 15:07:40 2011 +0200
    31.3 @@ -20,5 +20,5 @@
    31.4  #define READSOCKL_CVT_CRLF 0x02
    31.5  
    31.6  
    31.7 -int read_sockline(FILE * in, char *buf, int buf_len, int timeout, unsigned int flags);
    31.8 -int read_sockline1(FILE * in, char **pbuf, int *size, int timeout, unsigned int flags);
    31.9 +int read_sockline(FILE *in, char *buf, int buf_len, int timeout, unsigned int flags);
   31.10 +int read_sockline1(FILE *in, char **pbuf, int *size, int timeout, unsigned int flags);
    32.1 --- a/src/rewrite.c	Wed Sep 14 12:20:40 2011 +0200
    32.2 +++ b/src/rewrite.c	Thu Sep 22 15:07:40 2011 +0200
    32.3 @@ -21,7 +21,7 @@
    32.4  #endif
    32.5  
    32.6  gboolean
    32.7 -set_address_header_domain(header * hdr, gchar * domain)
    32.8 +set_address_header_domain(header *hdr, gchar *domain)
    32.9  {
   32.10  	gchar *p = hdr->value;
   32.11  	gchar *new_hdr = g_strndup(hdr->header, hdr->value - hdr->header);
   32.12 @@ -67,7 +67,7 @@
   32.13  }
   32.14  
   32.15  gboolean
   32.16 -map_address_header(header * hdr, GList * table)
   32.17 +map_address_header(header *hdr, GList *table)
   32.18  {
   32.19  	GList *addr_list = addr_list_append_rfc822(NULL, hdr->value, conf.host_name);
   32.20  	GList *addr_node;
    33.1 --- a/src/route.c	Wed Sep 14 12:20:40 2011 +0200
    33.2 +++ b/src/route.c	Thu Sep 22 15:07:40 2011 +0200
    33.3 @@ -22,7 +22,7 @@
    33.4  #include "masqmail.h"
    33.5  
    33.6  msgout_perhost*
    33.7 -create_msgout_perhost(gchar * host)
    33.8 +create_msgout_perhost(gchar *host)
    33.9  {
   33.10  	msgout_perhost *mo_ph = g_malloc(sizeof(msgout_perhost));
   33.11  	if (mo_ph) {
   33.12 @@ -33,7 +33,7 @@
   33.13  }
   33.14  
   33.15  void
   33.16 -destroy_msgout_perhost(msgout_perhost * mo_ph)
   33.17 +destroy_msgout_perhost(msgout_perhost *mo_ph)
   33.18  {
   33.19  	GList *mo_node;
   33.20  
   33.21 @@ -48,7 +48,7 @@
   33.22  }
   33.23  
   33.24  void
   33.25 -rewrite_headers(msg_out * msgout, connect_route * route)
   33.26 +rewrite_headers(msg_out *msgout, connect_route *route)
   33.27  {
   33.28  	/* if set_h_from_domain is set, replace domain in all
   33.29  	   From: headers.
   33.30 @@ -198,7 +198,7 @@
   33.31  If patterns is NULL: only splitting between local and others is done.
   33.32  */
   33.33  void
   33.34 -split_rcpts(GList* rcpt_list, GList* patterns, GList** rl_local, GList** rl_matching, GList** rl_others)
   33.35 +split_rcpts(GList *rcpt_list, GList *patterns, GList **rl_local, GList **rl_matching, GList **rl_others)
   33.36  {
   33.37  	GList *rcpt_node;
   33.38  	GList *host_node = NULL;
   33.39 @@ -238,7 +238,7 @@
   33.40  TODO: This function is almost exactly the same as remote_rcpts(). Merge?
   33.41  */
   33.42  GList*
   33.43 -local_rcpts(GList* rcpt_list)
   33.44 +local_rcpts(GList *rcpt_list)
   33.45  {
   33.46  	GList *rcpt_node;
   33.47  	GList *local_rcpts = NULL;
   33.48 @@ -261,7 +261,7 @@
   33.49  TODO: This function is almost exactly the same as local_rcpts(). Merge?
   33.50  */
   33.51  GList*
   33.52 -remote_rcpts(GList* rcpt_list)
   33.53 +remote_rcpts(GList *rcpt_list)
   33.54  {
   33.55  	GList *rcpt_node;
   33.56  	GList *remote_rcpts = NULL;
   33.57 @@ -283,8 +283,8 @@
   33.58  _g_list_addrcmp(gconstpointer pattern, gconstpointer addr)
   33.59  {
   33.60  	int res;
   33.61 -	address* patternaddr = (address*) pattern;
   33.62 -	address* stringaddr = (address*) addr;
   33.63 +	address *patternaddr = (address*) pattern;
   33.64 +	address *stringaddr = (address*) addr;
   33.65  
   33.66  	DEBUG(6) debugf("_g_list_addrcmp: pattern `%s' `%s' on string `%s' `%s'\n",
   33.67  	                patternaddr->local_part, patternaddr->domain,
   33.68 @@ -301,7 +301,7 @@
   33.69  }
   33.70  
   33.71  gboolean
   33.72 -route_sender_is_allowed(connect_route * route, address * ret_path)
   33.73 +route_sender_is_allowed(connect_route *route, address *ret_path)
   33.74  {
   33.75  	if (route->denied_senders && g_list_find_custom(route->denied_senders, ret_path, _g_list_addrcmp)) {
   33.76  		return FALSE;
   33.77 @@ -321,7 +321,7 @@
   33.78     Local domains are NOT regared here, these should be sorted out previously
   33.79  */
   33.80  void
   33.81 -route_split_rcpts(connect_route * route, GList * rcpt_list, GList ** p_rcpt_list, GList ** p_non_rcpt_list)
   33.82 +route_split_rcpts(connect_route *route, GList *rcpt_list, GList **p_rcpt_list, GList **p_non_rcpt_list)
   33.83  {
   33.84  	GList *tmp_list = NULL;
   33.85  	/* sort out those domains that can be sent over this connection: */
   33.86 @@ -339,7 +339,7 @@
   33.87  }
   33.88  
   33.89  msg_out*
   33.90 -route_prepare_msgout(connect_route * route, msg_out * msgout)
   33.91 +route_prepare_msgout(connect_route *route, msg_out *msgout)
   33.92  {
   33.93  	message *msg = msgout->msg;
   33.94  	GList *rcpt_list = msgout->rcpt_list;
   33.95 @@ -389,7 +389,7 @@
   33.96   */
   33.97  
   33.98  GList*
   33.99 -route_msgout_list(connect_route * route, GList * msgout_list)
  33.100 +route_msgout_list(connect_route *route, GList *msgout_list)
  33.101  {
  33.102  	GList *mo_ph_list = NULL;
  33.103  	GList *msgout_node;
    34.1 --- a/src/smtp_in.c	Wed Sep 14 12:20:40 2011 +0200
    34.2 +++ b/src/smtp_in.c	Thu Sep 22 15:07:40 2011 +0200
    34.3 @@ -43,7 +43,7 @@
    34.4  };
    34.5  
    34.6  static smtp_cmd_id
    34.7 -get_id(const gchar * line)
    34.8 +get_id(const gchar *line)
    34.9  {
   34.10  	gint i;
   34.11  	for (i = 0; i < SMTP_NUM_IDS; i++) {
   34.12 @@ -80,7 +80,7 @@
   34.13     Return false if address is too long.
   34.14  */
   34.15  static gboolean
   34.16 -get_address(gchar * line, gchar * addr)
   34.17 +get_address(gchar *line, gchar *addr)
   34.18  {
   34.19  	gchar *p = line;
   34.20  	gchar *q = addr;
   34.21 @@ -110,7 +110,7 @@
   34.22  }
   34.23  
   34.24  static smtp_connection*
   34.25 -create_base(gchar * remote_host)
   34.26 +create_base(gchar *remote_host)
   34.27  {
   34.28  	smtp_connection *base = g_malloc(sizeof(smtp_connection));
   34.29  	if (!base) {
   34.30 @@ -130,7 +130,7 @@
   34.31  }
   34.32  
   34.33  static void
   34.34 -smtp_printf(FILE * out, gchar * fmt, ...)
   34.35 +smtp_printf(FILE *out, gchar *fmt, ...)
   34.36  {
   34.37  	va_list args;
   34.38  	va_start(args, fmt);
   34.39 @@ -153,7 +153,7 @@
   34.40  }
   34.41  
   34.42  void
   34.43 -smtp_in(FILE * in, FILE * out, gchar * remote_host, gchar * ident)
   34.44 +smtp_in(FILE *in, FILE *out, gchar *remote_host, gchar *ident)
   34.45  {
   34.46  	gchar *buffer;
   34.47  	smtp_cmd_id cmd_id;
    35.1 --- a/src/smtp_out.c	Wed Sep 14 12:20:40 2011 +0200
    35.2 +++ b/src/smtp_out.c	Thu Sep 22 15:07:40 2011 +0200
    35.3 @@ -37,7 +37,7 @@
    35.4  #endif
    35.5  
    35.6  void
    35.7 -destroy_smtpbase(smtp_base * psb)
    35.8 +destroy_smtpbase(smtp_base *psb)
    35.9  {
   35.10  	fclose(psb->in);
   35.11  	fclose(psb->out);
   35.12 @@ -60,7 +60,7 @@
   35.13  }
   35.14  
   35.15  gchar*
   35.16 -set_heloname(smtp_base * psb, gchar * default_name, gboolean do_correct)
   35.17 +set_heloname(smtp_base *psb, gchar *default_name, gboolean do_correct)
   35.18  {
   35.19  	struct sockaddr_in sname;
   35.20  	int len = sizeof(struct sockaddr_in);
   35.21 @@ -90,7 +90,7 @@
   35.22  #ifdef ENABLE_AUTH
   35.23  
   35.24  gboolean
   35.25 -set_auth(smtp_base * psb, gchar * name, gchar * login, gchar * secret)
   35.26 +set_auth(smtp_base *psb, gchar *name, gchar *login, gchar *secret)
   35.27  {
   35.28  	if ((strcasecmp(name, "CRAM-MD5") == 0) || (strcasecmp(name, "LOGIN") == 0)) {
   35.29  		psb->auth_name = g_strdup(name);
   35.30 @@ -136,7 +136,7 @@
   35.31  }
   35.32  
   35.33  static gboolean
   35.34 -read_response(smtp_base * psb, int timeout)
   35.35 +read_response(smtp_base *psb, int timeout)
   35.36  {
   35.37  	gint buf_pos = 0;
   35.38  	gchar code[5];
   35.39 @@ -170,7 +170,7 @@
   35.40  }
   35.41  
   35.42  static gboolean
   35.43 -check_response(smtp_base * psb, gboolean after_data)
   35.44 +check_response(smtp_base *psb, gboolean after_data)
   35.45  {
   35.46  	char c = psb->buffer[0];
   35.47  
   35.48 @@ -191,7 +191,7 @@
   35.49  }
   35.50  
   35.51  static gchar*
   35.52 -get_response_arg(gchar * response)
   35.53 +get_response_arg(gchar *response)
   35.54  {
   35.55  	gchar buf[SMTP_BUF_LEN];
   35.56  	gchar *p = response, *q = buf;
   35.57 @@ -208,7 +208,7 @@
   35.58  }
   35.59  
   35.60  static gboolean
   35.61 -check_helo_response(smtp_base * psb)
   35.62 +check_helo_response(smtp_base *psb)
   35.63  {
   35.64  	gchar *ptr;
   35.65  
   35.66 @@ -292,7 +292,7 @@
   35.67  greeting messages.
   35.68  */
   35.69  static gboolean
   35.70 -smtp_helo(smtp_base * psb, gchar * helo)
   35.71 +smtp_helo(smtp_base *psb, gchar *helo)
   35.72  {
   35.73  	fprintf(psb->out, "EHLO %s\r\n", helo);
   35.74  	fflush(psb->out);
   35.75 @@ -330,7 +330,7 @@
   35.76  }
   35.77  
   35.78  static void
   35.79 -smtp_cmd_mailfrom(smtp_base * psb, address * return_path, guint size)
   35.80 +smtp_cmd_mailfrom(smtp_base *psb, address *return_path, guint size)
   35.81  {
   35.82  	if (psb->use_size) {
   35.83  		fprintf(psb->out, "MAIL FROM:%s SIZE=%d\r\n", addr_string(return_path), size);
   35.84 @@ -347,7 +347,7 @@
   35.85  }
   35.86  
   35.87  static void
   35.88 -smtp_cmd_rcptto(smtp_base * psb, address * rcpt)
   35.89 +smtp_cmd_rcptto(smtp_base *psb, address *rcpt)
   35.90  {
   35.91  	fprintf(psb->out, "RCPT TO:%s\r\n", addr_string(rcpt));
   35.92  	fflush(psb->out);
   35.93 @@ -355,7 +355,7 @@
   35.94  }
   35.95  
   35.96  static void
   35.97 -send_data_line(smtp_base * psb, gchar * data)
   35.98 +send_data_line(smtp_base *psb, gchar *data)
   35.99  {
  35.100  	/* According to RFC 821 each line should be terminated with CRLF.
  35.101  	   Since a dot on a line itself marks the end of data, each line
  35.102 @@ -386,7 +386,7 @@
  35.103  }
  35.104  
  35.105  static void
  35.106 -send_header(smtp_base * psb, GList * hdr_list)
  35.107 +send_header(smtp_base *psb, GList *hdr_list)
  35.108  {
  35.109  	GList *node;
  35.110  	gint num_hdrs = 0;
  35.111 @@ -412,7 +412,7 @@
  35.112  }
  35.113  
  35.114  static void
  35.115 -send_data(smtp_base * psb, message * msg)
  35.116 +send_data(smtp_base *psb, message *msg)
  35.117  {
  35.118  	GList *node;
  35.119  	gint num_lines = 0;
  35.120 @@ -435,7 +435,7 @@
  35.121  }
  35.122  
  35.123  void
  35.124 -smtp_out_mark_rcpts(smtp_base * psb, GList * rcpt_list)
  35.125 +smtp_out_mark_rcpts(smtp_base *psb, GList *rcpt_list)
  35.126  {
  35.127  	GList *rcpt_node;
  35.128  	for (rcpt_node = g_list_first(rcpt_list); rcpt_node; rcpt_node = g_list_next(rcpt_node)) {
  35.129 @@ -452,7 +452,7 @@
  35.130  }
  35.131  
  35.132  void
  35.133 -smtp_out_log_failure(smtp_base * psb, message * msg)
  35.134 +smtp_out_log_failure(smtp_base *psb, message *msg)
  35.135  {
  35.136  	gchar *err_str;
  35.137  
  35.138 @@ -477,7 +477,7 @@
  35.139  }
  35.140  
  35.141  smtp_base*
  35.142 -smtp_out_open(gchar * host, gint port, GList * resolve_list)
  35.143 +smtp_out_open(gchar *host, gint port, GList *resolve_list)
  35.144  {
  35.145  	smtp_base *psb;
  35.146  	gint sock;
  35.147 @@ -505,7 +505,7 @@
  35.148  }
  35.149  
  35.150  smtp_base*
  35.151 -smtp_out_open_child(gchar * cmd, char* host)
  35.152 +smtp_out_open_child(gchar *cmd, char *host)
  35.153  {
  35.154  	smtp_base *psb;
  35.155  	gint sock;
  35.156 @@ -524,7 +524,7 @@
  35.157  }
  35.158  
  35.159  gboolean
  35.160 -smtp_out_rset(smtp_base * psb)
  35.161 +smtp_out_rset(smtp_base *psb)
  35.162  {
  35.163  	gboolean ok;
  35.164  
  35.165 @@ -544,7 +544,7 @@
  35.166  #ifdef ENABLE_AUTH
  35.167  
  35.168  static gboolean
  35.169 -smtp_out_auth_cram_md5(smtp_base * psb)
  35.170 +smtp_out_auth_cram_md5(smtp_base *psb)
  35.171  {
  35.172  	gboolean ok = FALSE;
  35.173  
  35.174 @@ -596,7 +596,7 @@
  35.175  }
  35.176  
  35.177  static gboolean
  35.178 -smtp_out_auth_login(smtp_base * psb)
  35.179 +smtp_out_auth_login(smtp_base *psb)
  35.180  {
  35.181  	gboolean ok = FALSE;
  35.182  	fprintf(psb->out, "AUTH LOGIN\r\n");
  35.183 @@ -644,7 +644,7 @@
  35.184  }
  35.185  
  35.186  gboolean
  35.187 -smtp_out_auth(smtp_base * psb)
  35.188 +smtp_out_auth(smtp_base *psb)
  35.189  {
  35.190  	gboolean ok = FALSE;
  35.191  	gint i = 0;
  35.192 @@ -670,7 +670,7 @@
  35.193  #endif
  35.194  
  35.195  gboolean
  35.196 -smtp_out_init(smtp_base * psb, gboolean instant_helo)
  35.197 +smtp_out_init(smtp_base *psb, gboolean instant_helo)
  35.198  {
  35.199  	gboolean ok;
  35.200  
  35.201 @@ -702,7 +702,7 @@
  35.202  }
  35.203  
  35.204  gint
  35.205 -smtp_out_msg(smtp_base * psb, message * msg, address * return_path, GList * rcpt_list, GList * hdr_list)
  35.206 +smtp_out_msg(smtp_base *psb, message *msg, address *return_path, GList *rcpt_list, GList *hdr_list)
  35.207  {
  35.208  	gint i, size;
  35.209  	gboolean ok = TRUE;
  35.210 @@ -882,7 +882,7 @@
  35.211  }
  35.212  
  35.213  gboolean
  35.214 -smtp_out_quit(smtp_base * psb)
  35.215 +smtp_out_quit(smtp_base *psb)
  35.216  {
  35.217  	fprintf(psb->out, "QUIT\r\n");
  35.218  	fflush(psb->out);
  35.219 @@ -895,7 +895,7 @@
  35.220  }
  35.221  
  35.222  gint
  35.223 -smtp_deliver(gchar * host, gint port, GList * resolve_list, message * msg, address * return_path, GList * rcpt_list)
  35.224 +smtp_deliver(gchar *host, gint port, GList *resolve_list, message *msg, address *return_path, GList *rcpt_list)
  35.225  {
  35.226  	smtp_base *psb;
  35.227  	smtp_error err;
    36.1 --- a/src/smtp_out.h	Wed Sep 14 12:20:40 2011 +0200
    36.2 +++ b/src/smtp_out.h	Thu Sep 22 15:07:40 2011 +0200
    36.3 @@ -70,14 +70,14 @@
    36.4  
    36.5  } smtp_base;
    36.6  
    36.7 -gchar *set_heloname(smtp_base * psb, gchar * default_name, gboolean do_correct);
    36.8 -gboolean set_auth(smtp_base * psb, gchar * name, gchar * login, gchar * secret);
    36.9 -void destroy_smtpbase(smtp_base * psb);
   36.10 -smtp_base *smtp_out_open(gchar * host, gint port, GList * resolve_list);
   36.11 -smtp_base *smtp_out_open_child(gchar * cmd, char* host);
   36.12 -gboolean smtp_out_rset(smtp_base * psb);
   36.13 -gboolean smtp_out_init(smtp_base * psb, gboolean instant_helo);
   36.14 -gint smtp_out_msg(smtp_base * psb, message * msg, address * return_path, GList * rcpt_list, GList * hdr_list);
   36.15 -gboolean smtp_out_quit(smtp_base * psb);
   36.16 +gchar *set_heloname(smtp_base *psb, gchar *default_name, gboolean do_correct);
   36.17 +gboolean set_auth(smtp_base *psb, gchar *name, gchar *login, gchar *secret);
   36.18 +void destroy_smtpbase(smtp_base *psb);
   36.19 +smtp_base *smtp_out_open(gchar *host, gint port, GList *resolve_list);
   36.20 +smtp_base *smtp_out_open_child(gchar *cmd, char *host);
   36.21 +gboolean smtp_out_rset(smtp_base *psb);
   36.22 +gboolean smtp_out_init(smtp_base *psb, gboolean instant_helo);
   36.23 +gint smtp_out_msg(smtp_base *psb, message *msg, address *return_path, GList *rcpt_list, GList *hdr_list);
   36.24 +gboolean smtp_out_quit(smtp_base *psb);
   36.25  
   36.26 -gint smtp_deliver(gchar * host, gint port, GList * resolve_list, message * msg, address * return_path, GList * rcpt_list);
   36.27 +gint smtp_deliver(gchar *host, gint port, GList *resolve_list, message *msg, address *return_path, GList *rcpt_list);
    37.1 --- a/src/spool.c	Wed Sep 14 12:20:40 2011 +0200
    37.2 +++ b/src/spool.c	Thu Sep 22 15:07:40 2011 +0200
    37.3 @@ -23,7 +23,7 @@
    37.4  #include "dotlock.h"
    37.5  
    37.6  static gint
    37.7 -read_line(FILE * in, gchar * buf, gint buf_len)
    37.8 +read_line(FILE *in, gchar *buf, gint buf_len)
    37.9  {
   37.10  	gint p = 0;
   37.11  	gint c;
   37.12 @@ -49,7 +49,7 @@
   37.13  }
   37.14  
   37.15  static void
   37.16 -spool_write_rcpt(FILE * out, address * rcpt)
   37.17 +spool_write_rcpt(FILE *out, address *rcpt)
   37.18  {
   37.19  	gchar dlvrd_char = addr_is_delivered(rcpt) ? 'X' : (addr_is_failed(rcpt) ? 'F' : ' ');
   37.20  
   37.21 @@ -68,7 +68,7 @@
   37.22  }
   37.23  
   37.24  static address*
   37.25 -spool_scan_rcpt(gchar * line)
   37.26 +spool_scan_rcpt(gchar *line)
   37.27  {
   37.28  	address *rcpt = NULL;
   37.29  
   37.30 @@ -88,7 +88,7 @@
   37.31  }
   37.32  
   37.33  gboolean
   37.34 -spool_read_data(message * msg)
   37.35 +spool_read_data(message *msg)
   37.36  {
   37.37  	FILE *in;
   37.38  	gchar *spool_file;
   37.39 @@ -119,7 +119,7 @@
   37.40  }
   37.41  
   37.42  gboolean
   37.43 -spool_read_header(message * msg)
   37.44 +spool_read_header(message *msg)
   37.45  {
   37.46  	FILE *in;
   37.47  	gchar *spool_file;
   37.48 @@ -201,7 +201,7 @@
   37.49  }
   37.50  
   37.51  message*
   37.52 -msg_spool_read(gchar * uid)
   37.53 +msg_spool_read(gchar *uid)
   37.54  {
   37.55  	message *msg;
   37.56  	gboolean ok = FALSE;
   37.57 @@ -220,7 +220,7 @@
   37.58     mail ids. Better call spool_write(msg, FALSE).
   37.59  */
   37.60  static gboolean
   37.61 -spool_write_header(message * msg)
   37.62 +spool_write_header(message *msg)
   37.63  {
   37.64  	GList *node;
   37.65  	gchar *spool_file, *tmp_file;
   37.66 @@ -295,7 +295,7 @@
   37.67  }
   37.68  
   37.69  gboolean
   37.70 -spool_write(message * msg, gboolean do_write_data)
   37.71 +spool_write(message *msg, gboolean do_write_data)
   37.72  {
   37.73  	GList *list;
   37.74  	gchar *spool_file, *tmp_file;
   37.75 @@ -360,7 +360,7 @@
   37.76  #define MAX_LOCKAGE 300
   37.77  
   37.78  gboolean
   37.79 -spool_lock(gchar * uid)
   37.80 +spool_lock(gchar *uid)
   37.81  {
   37.82  	uid_t saved_uid, saved_gid;
   37.83  	gchar *hitch_name;
   37.84 @@ -391,7 +391,7 @@
   37.85  }
   37.86  
   37.87  gboolean
   37.88 -spool_unlock(gchar * uid)
   37.89 +spool_unlock(gchar *uid)
   37.90  {
   37.91  	uid_t saved_uid, saved_gid;
   37.92  	gchar *lock_name;
   37.93 @@ -413,7 +413,7 @@
   37.94  }
   37.95  
   37.96  gboolean
   37.97 -spool_delete_all(message * msg)
   37.98 +spool_delete_all(message *msg)
   37.99  {
  37.100  	uid_t saved_uid, saved_gid;
  37.101  	gchar *spool_file;
    38.1 --- a/src/tables.c	Wed Sep 14 12:20:40 2011 +0200
    38.2 +++ b/src/tables.c	Thu Sep 22 15:07:40 2011 +0200
    38.3 @@ -22,7 +22,7 @@
    38.4  #include "masqmail.h"
    38.5  
    38.6  table_pair*
    38.7 -create_pair(gchar * key, gpointer value)
    38.8 +create_pair(gchar *key, gpointer value)
    38.9  {
   38.10  	table_pair *pair;
   38.11  
   38.12 @@ -34,7 +34,7 @@
   38.13  }
   38.14  
   38.15  table_pair*
   38.16 -create_pair_string(gchar * key, gpointer value)
   38.17 +create_pair_string(gchar *key, gpointer value)
   38.18  {
   38.19  	table_pair *pair;
   38.20  
   38.21 @@ -46,7 +46,7 @@
   38.22  }
   38.23  
   38.24  table_pair*
   38.25 -parse_table_pair(gchar * line, char delim)
   38.26 +parse_table_pair(gchar *line, char delim)
   38.27  {
   38.28  	gchar buf[256];
   38.29  	gchar *p, *q;
   38.30 @@ -72,7 +72,7 @@
   38.31  }
   38.32  
   38.33  gpointer*
   38.34 -table_find_func(GList * table_list, gchar * key, int (*cmp_func) (const char *, const char *))
   38.35 +table_find_func(GList *table_list, gchar *key, int (*cmp_func) (const char *, const char *))
   38.36  {
   38.37  	GList *node;
   38.38  
   38.39 @@ -85,13 +85,13 @@
   38.40  }
   38.41  
   38.42  gpointer*
   38.43 -table_find(GList * table_list, gchar * key)
   38.44 +table_find(GList *table_list, gchar *key)
   38.45  {
   38.46  	return table_find_func(table_list, key, strcmp);
   38.47  }
   38.48  
   38.49  gpointer*
   38.50 -table_find_case(GList * table_list, gchar * key)
   38.51 +table_find_case(GList *table_list, gchar *key)
   38.52  {
   38.53  	return table_find_func(table_list, key, strcasecmp);
   38.54  }
   38.55 @@ -103,13 +103,13 @@
   38.56  }
   38.57  
   38.58  gpointer*
   38.59 -table_find_fnmatch(GList * table_list, gchar * key)
   38.60 +table_find_fnmatch(GList *table_list, gchar *key)
   38.61  {
   38.62  	return table_find_func(table_list, key, fnmatch0);
   38.63  }
   38.64  
   38.65  GList*
   38.66 -table_read(gchar * fname, gchar delim)
   38.67 +table_read(gchar *fname, gchar delim)
   38.68  {
   38.69  	GList *list = NULL;
   38.70  	FILE *fptr;
   38.71 @@ -137,7 +137,7 @@
   38.72  }
   38.73  
   38.74  void
   38.75 -destroy_table(GList * table)
   38.76 +destroy_table(GList *table)
   38.77  {
   38.78  	GList *node;
   38.79  
    39.1 --- a/src/timeival.c	Wed Sep 14 12:20:40 2011 +0200
    39.2 +++ b/src/timeival.c	Thu Sep 22 15:07:40 2011 +0200
    39.3 @@ -22,7 +22,7 @@
    39.4  #include "masqmail.h"
    39.5  
    39.6  gint
    39.7 -time_interval(gchar * str)
    39.8 +time_interval(gchar *str)
    39.9  {
   39.10  	gchar buf[16];
   39.11  	gchar *p = str, *q = buf;