* Changes in the source code of Alpine to define internal prototypes

     of all functions so that they follow modern C standards. This lead
     to the splitting of the gf_io_t type into two types gf_i_t and gf_o_t
     with different internal prototypes. More details in the file
     pith/detach.c. This work was initiated based on a report by
     Holger Hoffstätte.

3 files changed, 19 insertions, 35 deletions

diff --git a/web/src/alpined.d/alpined.c b/web/src/alpined.d/alpined.c
index c02a8e0e..b5d8420a 100644
--- a/web/src/alpined.d/alpined.c
+++ b/web/src/alpined.d/alpined.c
@@ -379,9 +379,9 @@ char	    *peSendSpamReport(long, char *, char *, char *);
 int	     peMsgnoFromUID(Tcl_Interp *, imapuid_t, int, Tcl_Obj **);
 int	     peMessageText(Tcl_Interp *, imapuid_t, int, Tcl_Obj **);
 int	     peMessageHeader(Tcl_Interp *, imapuid_t, int, Tcl_Obj **);
-void	     peFormatEnvelope(MAILSTREAM *, long, char *, ENVELOPE *, gf_io_t, long, char *, int);
-void	     peFormatEnvelopeAddress(MAILSTREAM *, long, char *, char *, ADDRESS *, int, char *, gf_io_t);
-void	     peFormatEnvelopeNewsgroups(char *, char *, int, gf_io_t);
+void	     peFormatEnvelope(MAILSTREAM *, long, char *, ENVELOPE *, gf_o_t, long, char *, int);
+void	     peFormatEnvelopeAddress(MAILSTREAM *, long, char *, char *, ADDRESS *, int, char *, gf_o_t);
+void	     peFormatEnvelopeNewsgroups(char *, char *, int, gf_o_t);
 void	     peFormatEnvelopeText(char *, char *);
 int	     peMessageAttachments(Tcl_Interp *, imapuid_t, int, Tcl_Obj **);
 int	     peMessageBody(Tcl_Interp *, imapuid_t, int, Tcl_Obj **);
@@ -8563,7 +8563,7 @@ peMessageHeader(Tcl_Interp *interp, imapuid_t uid, int objc, Tcl_Obj **objv)
 }
 
 void
-peFormatEnvelope(MAILSTREAM *s, long int n, char *sect, ENVELOPE *e, gf_io_t pc, long int which, char *oacs, int flags)
+peFormatEnvelope(MAILSTREAM *s, long int n, char *sect, ENVELOPE *e, gf_o_t pc, long int which, char *oacs, int flags)
 {
     char *p2, buftmp[MAILTMPLEN];
     Tcl_Obj *objHdr;
@@ -8667,14 +8667,14 @@ peFormatEnvelopeText(char *field_name, char *field_value)
  */
 void
 peFormatEnvelopeAddress(MAILSTREAM *stream, long int msgno, char *section, char *field_name,
-			struct mail_address *addr, int flags, char *oacs, gf_io_t pc)
+			struct mail_address *addr, int flags, char *oacs, gf_o_t pc)
 {
     char    *ptmp, *mtmp, *atype = "addr";
     int	     group = 0;
     ADDRESS *atmp;
     Tcl_Obj *objAddrList = NULL;
     STORE_S *tso;
-    gf_io_t  tpc;
+    gf_o_t   tpc;
     extern const char *rspecials;
     extern const char *rspecials_minus_quote_and_dot;
 
@@ -8803,7 +8803,7 @@ peFormatEnvelopeAddress(MAILSTREAM *stream, long int msgno, char *section, char
  * appends caller's result with: {"news" field_name {{newsgroup1} {newsgroup2} ... }}
  */
 void
-peFormatEnvelopeNewsgroups(char *field_name, char *newsgrps, int flags, gf_io_t pc)
+peFormatEnvelopeNewsgroups(char *field_name, char *newsgrps, int flags, gf_o_t pc)
 {
     char     buf[MAILTMPLEN];
     int	     llen;
@@ -9973,7 +9973,7 @@ peDetach(Tcl_Interp *interp, imapuid_t uid, int objc, Tcl_Obj **objv)
 {
     char	 *part, *err, *tfd, *tfn = NULL, *filename;
     long	  raw;
-    gf_io_t	  pc;
+    gf_o_t	  pc;
     BODY	 *body;
     STORE_S	 *store;
     Tcl_Obj	 *rvobj, *tObj, *stObj, *fnObj;
@@ -16368,7 +16368,8 @@ peRssFetch(Tcl_Interp *interp, char *link)
 		    RSS_FEED_S *feed;
 		    char       *err;
 		    STORE_S    *bucket;
-		    gf_io_t	gc, pc;
+		    gf_i_t	gc;
+		    gf_o_t	pc;
 
 		    /* grok response */
 		    bucket = so_get(CharStar, NULL, EDIT_ACCESS);
diff --git a/web/src/alpined.d/ldap.c b/web/src/alpined.d/ldap.c
index 347283fa..1fe5d811 100644
--- a/web/src/alpined.d/ldap.c
+++ b/web/src/alpined.d/ldap.c
@@ -26,13 +26,8 @@
 #ifdef ENABLE_LDAP
 
 int
-ldap_addr_select(ps, ac, result, style, wp_err, srchstr)
-    struct pine           *ps;
-    ADDR_CHOOSE_S         *ac;
-    LDAP_CHOOSE_S        **result;
-    LDAPLookupStyle        style;
-    WP_ERR_S              *wp_err;
-    char                  *srchstr;
+ldap_addr_select(struct pine *ps, ADDR_CHOOSE_S *ac, LDAP_CHOOSE_S **result,
+		LDAPLookupStyle style, WP_ERR_S *wp_err, char *srchstr)
 {
     LDAP_SERV_RES_S *res_list, *tmp_rl;
     LDAPMessage     *e, *tmp_e;
@@ -83,9 +78,7 @@ ldap_addr_select(ps, ac, result, style, wp_err, srchstr)
 
 
 char *
-peLdapPname(mailbox, host)
-     char *mailbox;
-     char *host;
+peLdapPname(char *mailbox, char *host)
 {
     char *retstr = NULL;
     char  adrstr[1024];
@@ -132,16 +125,10 @@ peLdapPname(mailbox, host)
 }
 
 int
-peLdapEntryParse(trl, e, ret_cn, ret_org, ret_unit, 
-		 ret_title, ret_mail, ret_sn)
-     LDAP_SERV_RES_S *trl;
-     LDAPMessage     *e;
-     struct berval ***ret_cn;
-     struct berval ***ret_org;
-     struct berval ***ret_unit;
-     struct berval ***ret_title;
-     struct berval ***ret_mail;
-     struct berval ***ret_sn;
+peLdapEntryParse(LDAP_SERV_RES_S *trl, LDAPMessage *e, struct berval ***ret_cn,
+		 struct berval ***ret_org, struct berval ***ret_unit,
+		 struct berval ***ret_title, struct berval ***ret_mail,
+		 struct berval ***ret_sn)
 {
     char       *a;
     struct berval **cn, **org, **unit, **title, **mail, **sn;
@@ -222,8 +209,7 @@ peLdapEntryParse(trl, e, ret_cn, ret_org, ret_unit,
 }
 
 WPLDAPRES_S *
-free_wpldapres(wpldapr)
-     WPLDAPRES_S *wpldapr;
+free_wpldapres(WPLDAPRES_S *wpldapr)
 {
     WPLDAPRES_S *tmp1, *tmp2;
 
diff --git a/web/src/alpined.d/remote.c b/web/src/alpined.d/remote.c
index 73d594fe..2e15785f 100644
--- a/web/src/alpined.d/remote.c
+++ b/web/src/alpined.d/remote.c
@@ -28,10 +28,7 @@
  */
 
 int
-rd_prompt_about_forged_remote_data(reason, rd, extra)
-    int        reason;
-    REMDATA_S *rd;
-    char      *extra;
+rd_prompt_about_forged_remote_data(int reason, REMDATA_S *rd, char *extra)
 {
     char  tmp[2000];
     char *unknown = "<unknown>";