1.1 --- a/src/smtp_out.h	Mon Oct 27 16:21:27 2008 +0100
     1.2 +++ b/src/smtp_out.h	Mon Oct 27 16:23:10 2008 +0100
     1.3 @@ -4,7 +4,7 @@
     1.4   * it under the terms of the GNU General Public License as published by
     1.5   * the Free Software Foundation; either version 2 of the License, or
     1.6   * (at your option) any later version.
     1.7 - * 
     1.8 + *
     1.9   * This program is distributed in the hope that it will be useful,
    1.10   * but WITHOUT ANY WARRANTY; without even the implied warranty of
    1.11   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    1.12 @@ -30,62 +30,55 @@
    1.13  #define SMTP_DATA_TIMEOUT 5*60
    1.14  #define SMTP_FINAL_TIMEOUT 10*60
    1.15  
    1.16 -typedef
    1.17 -enum _smtp_error{
    1.18 -  smtp_ok = 0,   /* mail was delivered to at least one recpient */
    1.19 -  smtp_trylater, /* server responded with 4xx */
    1.20 -  smtp_fail,     /* server responded with 5xx */
    1.21 -  smtp_timeout,  /* connection timed out */
    1.22 -  smtp_eof,      /* got unexpected EOF */
    1.23 -  smtp_syntax,   /* unexpected response */
    1.24 -  smtp_cancel    /* we gave up (eg. size) */
    1.25 +typedef enum _smtp_error {
    1.26 +	smtp_ok = 0,  /* mail was delivered to at least one recpient */
    1.27 +	smtp_trylater,  /* server responded with 4xx */
    1.28 +	smtp_fail,  /* server responded with 5xx */
    1.29 +	smtp_timeout,  /* connection timed out */
    1.30 +	smtp_eof,  /* got unexpected EOF */
    1.31 +	smtp_syntax,  /* unexpected response */
    1.32 +	smtp_cancel  /* we gave up (eg. size) */
    1.33  } smtp_error;
    1.34  
    1.35  
    1.36 -typedef
    1.37 -struct _smtp_base{
    1.38 -  FILE *in;
    1.39 -  FILE *out;
    1.40 +typedef struct _smtp_base {
    1.41 +	FILE *in;
    1.42 +	FILE *out;
    1.43  
    1.44 -  gint sock;
    1.45 -  gint dup_sock;
    1.46 +	gint sock;
    1.47 +	gint dup_sock;
    1.48  
    1.49 -  gchar *remote_host;
    1.50 -  gchar *helo_name;
    1.51 +	gchar *remote_host;
    1.52 +	gchar *helo_name;
    1.53  
    1.54 -  gchar *buffer;
    1.55 -  gint last_code;
    1.56 +	gchar *buffer;
    1.57 +	gint last_code;
    1.58  
    1.59 -  gboolean use_esmtp;
    1.60 -  gboolean use_size;
    1.61 -  gboolean use_pipelining;
    1.62 -  gboolean use_auth;
    1.63 -  
    1.64 -  gint max_size;
    1.65 +	gboolean use_esmtp;
    1.66 +	gboolean use_size;
    1.67 +	gboolean use_pipelining;
    1.68 +	gboolean use_auth;
    1.69  
    1.70 -  gchar **auth_names;
    1.71 +	gint max_size;
    1.72  
    1.73 -  gchar *auth_name;
    1.74 -  gchar *auth_login;
    1.75 -  gchar *auth_secret;
    1.76 +	gchar **auth_names;
    1.77  
    1.78 -  smtp_error error;
    1.79 +	gchar *auth_name;
    1.80 +	gchar *auth_login;
    1.81 +	gchar *auth_secret;
    1.82 +
    1.83 +	smtp_error error;
    1.84  
    1.85  } smtp_base;
    1.86  
    1.87 -gchar *set_heloname(smtp_base *psb, gchar *default_name, gboolean do_correct);
    1.88 -gboolean set_auth(smtp_base *psb, gchar *name, gchar *login, gchar *secret);
    1.89 -void destroy_smtpbase(smtp_base *psb);
    1.90 -smtp_base *smtp_out_open(gchar *host, gint port, GList *resolve_list);
    1.91 -smtp_base *smtp_out_open_child(gchar *cmd);
    1.92 -gboolean smtp_out_rset(smtp_base *psb);
    1.93 -gboolean smtp_out_init(smtp_base *psb);
    1.94 -gint smtp_out_msg(smtp_base *psb,
    1.95 -		  message *msg, address *return_path,
    1.96 -		  GList *rcpt_list, GList *hdr_list);
    1.97 -gboolean smtp_out_quit(smtp_base *psb);
    1.98 +gchar *set_heloname(smtp_base * psb, gchar * default_name, gboolean do_correct);
    1.99 +gboolean set_auth(smtp_base * psb, gchar * name, gchar * login, gchar * secret);
   1.100 +void destroy_smtpbase(smtp_base * psb);
   1.101 +smtp_base *smtp_out_open(gchar * host, gint port, GList * resolve_list);
   1.102 +smtp_base *smtp_out_open_child(gchar * cmd);
   1.103 +gboolean smtp_out_rset(smtp_base * psb);
   1.104 +gboolean smtp_out_init(smtp_base * psb);
   1.105 +gint smtp_out_msg(smtp_base * psb, message * msg, address * return_path, GList * rcpt_list, GList * hdr_list);
   1.106 +gboolean smtp_out_quit(smtp_base * psb);
   1.107  
   1.108 -gint smtp_deliver(gchar *host, gint port, GList *resolve_list,
   1.109 -		  message *msg,
   1.110 -		  address *return_path,
   1.111 -		  GList *rcpt_list);
   1.112 +gint smtp_deliver(gchar * host, gint port, GList * resolve_list, message * msg, address * return_path, GList * rcpt_list);