--- a/src/smtp_out.h	Mon Oct 27 16:21:27 2008 +0100
+++ b/src/smtp_out.h	Mon Oct 27 16:23:10 2008 +0100
@@ -4,7 +4,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -30,62 +30,55 @@
 #define SMTP_DATA_TIMEOUT 5*60
 #define SMTP_FINAL_TIMEOUT 10*60
 
-typedef
-enum _smtp_error{
-  smtp_ok = 0,   /* mail was delivered to at least one recpient */
-  smtp_trylater, /* server responded with 4xx */
-  smtp_fail,     /* server responded with 5xx */
-  smtp_timeout,  /* connection timed out */
-  smtp_eof,      /* got unexpected EOF */
-  smtp_syntax,   /* unexpected response */
-  smtp_cancel    /* we gave up (eg. size) */
+typedef enum _smtp_error {
+	smtp_ok = 0,  /* mail was delivered to at least one recpient */
+	smtp_trylater,  /* server responded with 4xx */
+	smtp_fail,  /* server responded with 5xx */
+	smtp_timeout,  /* connection timed out */
+	smtp_eof,  /* got unexpected EOF */
+	smtp_syntax,  /* unexpected response */
+	smtp_cancel  /* we gave up (eg. size) */
 } smtp_error;
 
 
-typedef
-struct _smtp_base{
-  FILE *in;
-  FILE *out;
+typedef struct _smtp_base {
+	FILE *in;
+	FILE *out;
 
-  gint sock;
-  gint dup_sock;
+	gint sock;
+	gint dup_sock;
 
-  gchar *remote_host;
-  gchar *helo_name;
+	gchar *remote_host;
+	gchar *helo_name;
 
-  gchar *buffer;
-  gint last_code;
+	gchar *buffer;
+	gint last_code;
 
-  gboolean use_esmtp;
-  gboolean use_size;
-  gboolean use_pipelining;
-  gboolean use_auth;
-  
-  gint max_size;
+	gboolean use_esmtp;
+	gboolean use_size;
+	gboolean use_pipelining;
+	gboolean use_auth;
+
+	gint max_size;
 
-  gchar **auth_names;
+	gchar **auth_names;
 
-  gchar *auth_name;
-  gchar *auth_login;
-  gchar *auth_secret;
+	gchar *auth_name;
+	gchar *auth_login;
+	gchar *auth_secret;
 
-  smtp_error error;
+	smtp_error error;
 
 } 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);
-gboolean smtp_out_rset(smtp_base *psb);
-gboolean smtp_out_init(smtp_base *psb);
-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);
+gboolean smtp_out_rset(smtp_base * psb);
+gboolean smtp_out_init(smtp_base * psb);
+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);