diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2021-10-03 20:32:22 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2021-10-03 20:32:22 -0600 |
| commit | da6cdd6b8083201c66349133693a173704f5d4df (patch) | |
| tree | 0118a022be15f2401c2092dc541109e6336d356c /pith | |
| parent | a443129c36cd2f93c48a00c6b59b25c7585c64c2 (diff) | |
| download | alpine-da6cdd6b8083201c66349133693a173704f5d4df.tar.xz | |
* Code clean up and removal of some warnings.
Diffstat (limited to 'pith')
89 files changed, 20 insertions, 377 deletions
diff --git a/pith/abdlc.c b/pith/abdlc.c index f320c1c4..6be21b8e 100644 --- a/pith/abdlc.c +++ b/pith/abdlc.c @@ -1,11 +1,7 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: abdlc.c 769 2007-10-24 00:15:40Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== - * Copyright 2006-2007 University of Washington * Copyright 2013-2021 Eduardo Chappa + * Copyright 2006-2007 University of Washington * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pith/ablookup.c b/pith/ablookup.c index fca00bfc..8444eeda 100644 --- a/pith/ablookup.c +++ b/pith/ablookup.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: ablookup.c 1266 2009-07-14 18:39:12Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/addrbook.c b/pith/addrbook.c index b52fe018..eee1526f 100644 --- a/pith/addrbook.c +++ b/pith/addrbook.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: addrbook.c 90 2006-07-19 22:30:36Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/addrstring.c b/pith/addrstring.c index 7eb844eb..ac325283 100644 --- a/pith/addrstring.c +++ b/pith/addrstring.c @@ -1,11 +1,7 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: addrstring.c 770 2007-10-24 00:23:09Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== - * Copyright 2006-2007 University of Washington * Copyright 2013-2021 Eduardo Chappa + * Copyright 2006-2007 University of Washington * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pith/adjtime.c b/pith/adjtime.c index 759e8fb0..43608296 100644 --- a/pith/adjtime.c +++ b/pith/adjtime.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: adjtime.c 761 2007-10-23 22:35:18Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/adrbklib.c b/pith/adrbklib.c index c743ae8d..5b768ee2 100644 --- a/pith/adrbklib.c +++ b/pith/adrbklib.c @@ -1,10 +1,6 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: adrbklib.c 1266 2009-07-14 18:39:12Z hubert@u.washington.edu $"; -#endif - /* ======================================================================== - * Copyright 2006-2009 University of Washington * Copyright 2013-2021 Eduardo Chappa + * Copyright 2006-2009 University of Washington * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pith/bldaddr.c b/pith/bldaddr.c index 3d22f895..dc6a4cd2 100644 --- a/pith/bldaddr.c +++ b/pith/bldaddr.c @@ -1,11 +1,7 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: bldaddr.c 769 2007-10-24 00:15:40Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== - * Copyright 2006-2007 University of Washington * Copyright 2013-2021 Eduardo Chappa + * Copyright 2006-2007 University of Washington * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pith/charconv/filesys.c b/pith/charconv/filesys.c index 3a9b5d91..e65824f1 100644 --- a/pith/charconv/filesys.c +++ b/pith/charconv/filesys.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: filesys.c 770 2007-10-24 00:23:09Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/charconv/utf8.c b/pith/charconv/utf8.c index ee5ab852..1acc0be6 100644 --- a/pith/charconv/utf8.c +++ b/pith/charconv/utf8.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: utf8.c 1184 2008-12-16 23:52:15Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa @@ -713,7 +709,7 @@ ucs4_to_utf8_n_cpystr(UCS *ucs4src, int retlen) for(i = 0; ucs4src[i] && (len < retlen); i++){ oldlen = len; writeptr = utf8_put(writeptr, (unsigned long) ucs4src[i]); - len = strlen(ret); + len = strlen((char *)ret); } if(len > retlen){ ret[oldlen] = '\0'; diff --git a/pith/charset.c b/pith/charset.c index a5daa3fb..9ffceb8e 100644 --- a/pith/charset.c +++ b/pith/charset.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: charset.c 1032 2008-04-11 00:30:04Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/color.c b/pith/color.c index 0b036529..bdb6280d 100644 --- a/pith/color.c +++ b/pith/color.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: color.c 769 2007-10-24 00:15:40Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/conf.c b/pith/conf.c index 704c6911..b7f9b863 100644 --- a/pith/conf.c +++ b/pith/conf.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: conf.c 1266 2009-07-14 18:39:12Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa @@ -5663,7 +5659,6 @@ write_pinerc(struct pine *ps, EditWhich which, int flags) STORE_S *so = NULL; #ifndef _WINDOWS struct stat sbuf; - char *slink = NULL; #endif #define MAXPLINESIZE 10000 @@ -8337,7 +8332,7 @@ get_supported_options(void) AUTHENTICATOR *a; char *title = _("Supported features in this Alpine"); char sbuf[MAX_SCREEN_COLS+1], tmp[128]; - int cnt, alcnt, len, cols, disabled, any_disabled = 0, i; + int cnt, alcnt, len, cols, disabled, any_disabled = 0; /* * Line count: diff --git a/pith/context.c b/pith/context.c index 3b368fef..bda1ebd4 100644 --- a/pith/context.c +++ b/pith/context.c @@ -1,11 +1,7 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: context.c 1144 2008-08-14 16:53:34Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== - * Copyright 2006-2007 University of Washington * Copyright 2013-2021 Eduardo Chappa + * Copyright 2006-2007 University of Washington * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pith/copyaddr.c b/pith/copyaddr.c index a89c9eca..a38882fb 100644 --- a/pith/copyaddr.c +++ b/pith/copyaddr.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: copyaddr.c 761 2007-10-23 22:35:18Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/detach.c b/pith/detach.c index d664a112..b4ae27ba 100644 --- a/pith/detach.c +++ b/pith/detach.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: detach.c 1074 2008-06-04 00:08:43Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/detoken.c b/pith/detoken.c index 960876c8..ea814bdd 100644 --- a/pith/detoken.c +++ b/pith/detoken.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: detoken.c 769 2007-10-24 00:15:40Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/editorial.c b/pith/editorial.c index dbbdbd0b..e523f72d 100644 --- a/pith/editorial.c +++ b/pith/editorial.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: editorial.c 768 2007-10-24 00:10:03Z hubert@u.washington.edu $"; -#endif - /* ======================================================================== * Copyright 2013-2021 Eduardo Chappa * Copyright 2006-2007 University of Washington diff --git a/pith/escapes.c b/pith/escapes.c index d6b7165a..9cd44fb3 100644 --- a/pith/escapes.c +++ b/pith/escapes.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: escapes.c 761 2007-10-23 22:35:18Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/filter.c b/pith/filter.c index e4f72058..09f3be3c 100644 --- a/pith/filter.c +++ b/pith/filter.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: filter.c 1266 2009-07-14 18:39:12Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa @@ -9059,7 +9055,7 @@ cid_tempfile_name(char *line, long n, int *is_cidp) { int f2 = 0; int i, found; - char *s, *t = NULL, *u, c; + char *s, *t = NULL, c; char imgfile[1024]; char *extp = NULL; @@ -9171,7 +9167,6 @@ gf_html_cid2file(FILTER_S *f, int cmd) } else if (state == 2){ /* collect all data */ if(ASCII_ISSPACE(c) || c == '>'){ - long n; int is_cid; if(f->n > 0){ char *s = cid_tempfile_name(f->line, f->n, &is_cid); diff --git a/pith/flag.c b/pith/flag.c index dab36cea..df9c2783 100644 --- a/pith/flag.c +++ b/pith/flag.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: flag.c 1142 2008-08-13 17:22:21Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/folder.c b/pith/folder.c index 8c286a42..62d7e45b 100644 --- a/pith/folder.c +++ b/pith/folder.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: folder.c 1142 2008-08-13 17:22:21Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/handle.c b/pith/handle.c index 321b14b1..01b9b4d8 100644 --- a/pith/handle.c +++ b/pith/handle.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: handle.c 769 2007-10-24 00:15:40Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/help.c b/pith/help.c index 91907f20..be41b69b 100644 --- a/pith/help.c +++ b/pith/help.c @@ -1,11 +1,7 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: help.c 900 2008-01-05 01:13:26Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== - * Copyright 2006-2008 University of Washington * Copyright 2013-2021 Eduardo Chappa + * Copyright 2006-2008 University of Washington * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pith/helpindx.c b/pith/helpindx.c index e04459c4..0a8acd51 100644 --- a/pith/helpindx.c +++ b/pith/helpindx.c @@ -1,11 +1,7 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: helpindx.c 769 2007-10-24 00:15:40Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== - * Copyright 2006-2007 University of Washington * Copyright 2013-2021 Eduardo Chappa + * Copyright 2006-2007 University of Washington * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pith/hist.c b/pith/hist.c index 24aa530c..21e184ae 100644 --- a/pith/hist.c +++ b/pith/hist.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: hist.c 807 2007-11-09 01:21:33Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/icache.c b/pith/icache.c index 4de55387..95d5e78d 100644 --- a/pith/icache.c +++ b/pith/icache.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: icache.c 874 2007-12-15 02:51:06Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/imap.c b/pith/imap.c index 7c74efaf..cde97ccf 100644 --- a/pith/imap.c +++ b/pith/imap.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: imap.c 1142 2008-08-13 17:22:21Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/init.c b/pith/init.c index 4180f45d..64822fb3 100644 --- a/pith/init.c +++ b/pith/init.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: init.c 769 2007-10-24 00:15:40Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/keyword.c b/pith/keyword.c index 006304bf..b7874d5b 100644 --- a/pith/keyword.c +++ b/pith/keyword.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: keyword.c 807 2007-11-09 01:21:33Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/ldap.c b/pith/ldap.c index a091fc26..c2f2a78c 100644 --- a/pith/ldap.c +++ b/pith/ldap.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: ldap.c 1204 2009-02-02 19:54:23Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/list.c b/pith/list.c index e93ae256..f56260c0 100644 --- a/pith/list.c +++ b/pith/list.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: list.c 769 2007-10-24 00:15:40Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2006-2007 University of Washington diff --git a/pith/mailcap.c b/pith/mailcap.c index 486bd578..fac448f4 100644 --- a/pith/mailcap.c +++ b/pith/mailcap.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: mailcap.c 1012 2008-03-26 00:44:22Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/mailcmd.c b/pith/mailcmd.c index 2c2b07d9..e5e70e02 100644 --- a/pith/mailcmd.c +++ b/pith/mailcmd.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: mailcmd.c 1142 2008-08-13 17:22:21Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/mailindx.c b/pith/mailindx.c index 918b3ddb..f9a4532c 100644 --- a/pith/mailindx.c +++ b/pith/mailindx.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: mailindx.c 1266 2009-07-14 18:39:12Z hubert@u.washington.edu $"; -#endif - /* ======================================================================== * Copyright 2013-2021 Eduardo Chappa * Copyright 2006-2008 University of Washington diff --git a/pith/maillist.c b/pith/maillist.c index c8b7f728..55445d74 100644 --- a/pith/maillist.c +++ b/pith/maillist.c @@ -1,11 +1,7 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: maillist.c 769 2007-10-24 00:15:40Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== - * Copyright 2006-2007 University of Washington * Copyright 2013-2021 Eduardo Chappa + * Copyright 2006-2007 University of Washington * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pith/mailview.c b/pith/mailview.c index dc0c49b1..cc8edc2c 100644 --- a/pith/mailview.c +++ b/pith/mailview.c @@ -1,11 +1,7 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: mailview.c 1266 2009-07-14 18:39:12Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== - * Copyright 2006-2009 University of Washington * Copyright 2013-2021 Eduardo Chappa + * Copyright 2006-2009 University of Washington * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pith/margin.c b/pith/margin.c index d49b8801..86f669a6 100644 --- a/pith/margin.c +++ b/pith/margin.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: margin.c 1032 2008-04-11 00:30:04Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/mimedesc.c b/pith/mimedesc.c index 95b5712e..cd9a3a5e 100644 --- a/pith/mimedesc.c +++ b/pith/mimedesc.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: mimedesc.c 1142 2008-08-13 17:22:21Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/mimetype.c b/pith/mimetype.c index 65ca946a..63da79f8 100644 --- a/pith/mimetype.c +++ b/pith/mimetype.c @@ -1,11 +1,7 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: mimetype.c 955 2008-03-06 23:52:36Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== - * Copyright 2006-2008 University of Washington * Copyright 2013-2021 Eduardo Chappa + * Copyright 2006-2008 University of Washington * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pith/msgno.c b/pith/msgno.c index d4a4e7b7..6f4d6b02 100644 --- a/pith/msgno.c +++ b/pith/msgno.c @@ -1,11 +1,7 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: msgno.c 854 2007-12-07 17:44:43Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== - * Copyright 2006-2007 University of Washington * Copyright 2013-2021 Eduardo Chappa + * Copyright 2006-2007 University of Washington * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pith/newmail.c b/pith/newmail.c index ca29df89..518c112c 100644 --- a/pith/newmail.c +++ b/pith/newmail.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: newmail.c 1266 2009-07-14 18:39:12Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/news.c b/pith/news.c index c24e8014..6727b368 100644 --- a/pith/news.c +++ b/pith/news.c @@ -1,11 +1,7 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: news.c 769 2007-10-24 00:15:40Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== - * Copyright 2006-2007 University of Washington * Copyright 2013-2021 Eduardo Chappa + * Copyright 2006-2007 University of Washington * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pith/osdep/bldpath.c b/pith/osdep/bldpath.c index 1f4ed6af..a78bda83 100644 --- a/pith/osdep/bldpath.c +++ b/pith/osdep/bldpath.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: bldpath.c 934 2008-02-23 00:44:29Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/osdep/canaccess.c b/pith/osdep/canaccess.c index 2b10d58a..38058310 100644 --- a/pith/osdep/canaccess.c +++ b/pith/osdep/canaccess.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: canaccess.c 769 2007-10-24 00:15:40Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/osdep/canonicl.c b/pith/osdep/canonicl.c index bad655cf..2ba5b7b7 100644 --- a/pith/osdep/canonicl.c +++ b/pith/osdep/canonicl.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: canonicl.c 764 2007-10-23 23:44:49Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/osdep/collate.c b/pith/osdep/collate.c index fc631d65..1b4ed077 100644 --- a/pith/osdep/collate.c +++ b/pith/osdep/collate.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: collate.c 766 2007-10-23 23:59:00Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/osdep/color.c b/pith/osdep/color.c index fe65898d..0914da1c 100644 --- a/pith/osdep/color.c +++ b/pith/osdep/color.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: color.c 761 2007-10-23 22:35:18Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/osdep/coredump.c b/pith/osdep/coredump.c index c668ffad..cec5369d 100644 --- a/pith/osdep/coredump.c +++ b/pith/osdep/coredump.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: coredump.c 761 2007-10-23 22:35:18Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/osdep/creatdir.c b/pith/osdep/creatdir.c index 4d0f6d9b..1c3a115e 100644 --- a/pith/osdep/creatdir.c +++ b/pith/osdep/creatdir.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: creatdir.c 769 2007-10-24 00:15:40Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2006-2007 University of Washington diff --git a/pith/osdep/debugtime.c b/pith/osdep/debugtime.c index 0cd3123f..0cb04ed8 100644 --- a/pith/osdep/debugtime.c +++ b/pith/osdep/debugtime.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: debugtime.c 770 2007-10-24 00:23:09Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/osdep/domnames.c b/pith/osdep/domnames.c index aa2d917f..d244d9f5 100644 --- a/pith/osdep/domnames.c +++ b/pith/osdep/domnames.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: domnames.c 1176 2008-09-29 21:16:42Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/osdep/err_desc.c b/pith/osdep/err_desc.c index 9f24720d..cf798138 100644 --- a/pith/osdep/err_desc.c +++ b/pith/osdep/err_desc.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: err_desc.c 761 2007-10-23 22:35:18Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/osdep/fgetpos.c b/pith/osdep/fgetpos.c index ba433e95..0d84db91 100644 --- a/pith/osdep/fgetpos.c +++ b/pith/osdep/fgetpos.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: fgetpos.c 761 2007-10-23 22:35:18Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/osdep/filesize.c b/pith/osdep/filesize.c index abb747c6..1995c566 100644 --- a/pith/osdep/filesize.c +++ b/pith/osdep/filesize.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: filesize.c 761 2007-10-23 22:35:18Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/osdep/fnexpand.c b/pith/osdep/fnexpand.c index 8c5a52fd..4b6b42f9 100644 --- a/pith/osdep/fnexpand.c +++ b/pith/osdep/fnexpand.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: fnexpand.c 761 2007-10-23 22:35:18Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/osdep/hostname.c b/pith/osdep/hostname.c index 3549932a..8bf08d7b 100644 --- a/pith/osdep/hostname.c +++ b/pith/osdep/hostname.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: hostname.c 1176 2008-09-29 21:16:42Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/osdep/lstcmpnt.c b/pith/osdep/lstcmpnt.c index a7297c5b..bcb3d1b6 100644 --- a/pith/osdep/lstcmpnt.c +++ b/pith/osdep/lstcmpnt.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: lstcmpnt.c 1074 2008-06-04 00:08:43Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2006-2008 University of Washington diff --git a/pith/osdep/mimedisp.c b/pith/osdep/mimedisp.c index 8fec4eb6..80b48c92 100644 --- a/pith/osdep/mimedisp.c +++ b/pith/osdep/mimedisp.c @@ -1,11 +1,7 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: mimedisp.c 942 2008-03-04 18:21:33Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== - * Copyright 2006-2008 University of Washington * Copyright 2013-2021 Eduardo Chappa + * Copyright 2006-2008 University of Washington * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pith/osdep/pipe.c b/pith/osdep/pipe.c index 1e47e83f..10b050d7 100644 --- a/pith/osdep/pipe.c +++ b/pith/osdep/pipe.c @@ -1,11 +1,7 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: pipe.c 1204 2009-02-02 19:54:23Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== - * Copyright 2006-2008 University of Washington * Copyright 2013-2021 Eduardo Chappa + * Copyright 2006-2008 University of Washington * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pith/osdep/pw_stuff.c b/pith/osdep/pw_stuff.c index dfbfe3a5..73faeeb6 100644 --- a/pith/osdep/pw_stuff.c +++ b/pith/osdep/pw_stuff.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: pw_stuff.c 763 2007-10-23 23:37:34Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/osdep/rename.c b/pith/osdep/rename.c index 74cfbb2f..28921e07 100644 --- a/pith/osdep/rename.c +++ b/pith/osdep/rename.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: rename.c 761 2007-10-23 22:35:18Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/osdep/temp_nam.c b/pith/osdep/temp_nam.c index 21aa0f26..ef295efe 100644 --- a/pith/osdep/temp_nam.c +++ b/pith/osdep/temp_nam.c @@ -1,11 +1,7 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: temp_nam.c 1012 2008-03-26 00:44:22Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== - * Copyright 2006-2008 University of Washington * Copyright 2013-2021 Eduardo Chappa + * Copyright 2006-2008 University of Washington * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pith/osdep/tempfile.c b/pith/osdep/tempfile.c index 1a4ab999..80445553 100644 --- a/pith/osdep/tempfile.c +++ b/pith/osdep/tempfile.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: tempfile.c 1074 2008-06-04 00:08:43Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2006-2008 University of Washington diff --git a/pith/osdep/writ_dir.c b/pith/osdep/writ_dir.c index 0a2cd78b..63f3f32e 100644 --- a/pith/osdep/writ_dir.c +++ b/pith/osdep/writ_dir.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: writ_dir.c 761 2007-10-23 22:35:18Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/pattern.c b/pith/pattern.c index d5efae86..0a113fbf 100644 --- a/pith/pattern.c +++ b/pith/pattern.c @@ -1,6 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: pattern.c 1204 2009-02-02 19:54:23Z hubert@u.washington.edu $"; -#endif /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/pipe.c b/pith/pipe.c index 4d7e6149..601a142d 100644 --- a/pith/pipe.c +++ b/pith/pipe.c @@ -1,6 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: pipe.c 761 2007-10-23 22:35:18Z hubert@u.washington.edu $"; -#endif /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/readfile.c b/pith/readfile.c index 443953d4..f0bc76a9 100644 --- a/pith/readfile.c +++ b/pith/readfile.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: readfile.c 761 2007-10-23 22:35:18Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/remote.c b/pith/remote.c index 3345e84a..e66f5eaa 100644 --- a/pith/remote.c +++ b/pith/remote.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: remote.c 1074 2008-06-04 00:08:43Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/reply.c b/pith/reply.c index deffc6fe..cc884ce3 100644 --- a/pith/reply.c +++ b/pith/reply.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: reply.c 1074 2008-06-04 00:08:43Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa @@ -3701,7 +3697,6 @@ forward_multi_alt_mixed(MAILSTREAM *stream, ENVELOPE *env, struct mail_bodystruc BODY *body = NULL, *text_body = NULL; PART *part = NULL; char prefix_buf[FWDTMPLEN]; - char *new_charset = NULL; int partnum; char *section, sect_buf[256]; int forward_raw_body = 0; diff --git a/pith/rfc2231.c b/pith/rfc2231.c index 29806039..c8a1834a 100644 --- a/pith/rfc2231.c +++ b/pith/rfc2231.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: rfc2231.c 1012 2008-03-26 00:44:22Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/save.c b/pith/save.c index 96a8d989..c4fccb9b 100644 --- a/pith/save.c +++ b/pith/save.c @@ -1,11 +1,7 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: save.c 1204 2009-02-02 19:54:23Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== - * Copyright 2006-2009 University of Washington * Copyright 2013-2021 Eduardo Chappa + * Copyright 2006-2009 University of Washington * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pith/search.c b/pith/search.c index 617f4bce..711363de 100644 --- a/pith/search.c +++ b/pith/search.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: search.c 854 2007-12-07 17:44:43Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/send.c b/pith/send.c index d026e856..e4948ab9 100644 --- a/pith/send.c +++ b/pith/send.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: send.c 1204 2009-02-02 19:54:23Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/sequence.c b/pith/sequence.c index b0e4d290..95b3eb71 100644 --- a/pith/sequence.c +++ b/pith/sequence.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: sequence.c 1012 2008-03-26 00:44:22Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/smime.c b/pith/smime.c index e6f207f9..3412670b 100644 --- a/pith/smime.c +++ b/pith/smime.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: smime.c 1176 2008-09-29 21:16:42Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa @@ -664,7 +660,7 @@ import_certificate(WhichCerts ctype, PERSONAL_CERT *p_cert, char *fname) if(key != NULL || (key = load_pkey_with_prompt(full_filename, NULL, prompt, NULL)) != NULL){ BIO *ins = NULL; - X509 *cert = p_cert ? p_cert->cert : NULL, *cert2; + X509 *cert = p_cert ? p_cert->cert : NULL; strncpy(full_name_key, full_filename, sizeof(full_filename)); full_name_key[sizeof(full_name_key)-1] = '\0'; diff --git a/pith/smkeys.c b/pith/smkeys.c index e4402c24..2911eaf6 100644 --- a/pith/smkeys.c +++ b/pith/smkeys.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: smkeys.c 1266 2009-07-14 18:39:12Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/sort.c b/pith/sort.c index 8ac6aa25..c7fb1abf 100644 --- a/pith/sort.c +++ b/pith/sort.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: sort.c 1142 2008-08-13 17:22:21Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/state.c b/pith/state.c index 2918116a..7cf92efa 100644 --- a/pith/state.c +++ b/pith/state.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: state.c 1074 2008-06-04 00:08:43Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/status.c b/pith/status.c index b0927be3..c3f681ce 100644 --- a/pith/status.c +++ b/pith/status.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: status.c 761 2007-10-23 22:35:18Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/store.c b/pith/store.c index 9051b8a4..73fce46f 100644 --- a/pith/store.c +++ b/pith/store.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: store.c 1074 2008-06-04 00:08:43Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/stream.c b/pith/stream.c index 16dfedd0..e73efd1d 100644 --- a/pith/stream.c +++ b/pith/stream.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: stream.c 1012 2008-03-26 00:44:22Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/string.c b/pith/string.c index fe35857c..d7f5c256 100644 --- a/pith/string.c +++ b/pith/string.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: string.c 910 2008-01-14 22:28:38Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/strlst.c b/pith/strlst.c index 789b045a..a7dea975 100644 --- a/pith/strlst.c +++ b/pith/strlst.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: strlst.c 761 2007-10-23 22:35:18Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/takeaddr.c b/pith/takeaddr.c index 447a12e3..5dcef90a 100644 --- a/pith/takeaddr.c +++ b/pith/takeaddr.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: takeaddr.c 1012 2008-03-26 00:44:22Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2006-2007 University of Washington diff --git a/pith/tempfile.c b/pith/tempfile.c index 96cf8256..168e46ed 100644 --- a/pith/tempfile.c +++ b/pith/tempfile.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: tempfile.c 770 2007-10-24 00:23:09Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2006-2007 University of Washington diff --git a/pith/text.c b/pith/text.c index 1d3f1d90..578e0d1b 100644 --- a/pith/text.c +++ b/pith/text.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: text.c 1266 2009-07-14 18:39:12Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa diff --git a/pith/thread.c b/pith/thread.c index fedd5906..e5fb712d 100644 --- a/pith/thread.c +++ b/pith/thread.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: thread.c 942 2008-03-04 18:21:33Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: url.c 769 2007-10-24 00:15:40Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2006-2007 University of Washington diff --git a/pith/util.c b/pith/util.c index 2f097591..e95ecf1d 100644 --- a/pith/util.c +++ b/pith/util.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(DOS) -static char rcsid[] = "$Id: util.c 761 2007-10-23 22:35:18Z hubert@u.washington.edu $"; -#endif - /* * ======================================================================== * Copyright 2013-2021 Eduardo Chappa |