[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Nmh-commits] nmh ChangeLog h/mh.h sbr/done.c uip/ali.c uip/a...
|
From: |
Joel Reicher |
|
Subject: |
[Nmh-commits] nmh ChangeLog h/mh.h sbr/done.c uip/ali.c uip/a... |
|
Date: |
Sun, 04 Nov 2007 11:54:37 +0000 |
CVSROOT: /sources/nmh
Module name: nmh
Changes by: Joel Reicher <jjr> 07/11/04 11:54:36
Modified files:
. : ChangeLog
h : mh.h
sbr : done.c
uip : ali.c anno.c ap.c burst.c comp.c conflict.c
dist.c dp.c flist.c fmtdump.c folder.c forw.c
inc.c install-mh.c mark.c mhbuild.c
mhbuildsbr.c mhfree.c mhl.c mhlist.c mhn.c
mhparam.c mhparse.c mhpath.c mhshow.c mhstore.c
mhtest.c msgchk.c msh.c packf.c pick.c post.c
prompter.c rcvdist.c rcvpack.c rcvstore.c
refile.c repl.c rmf.c rmm.c scan.c send.c
sendsbr.c slocal.c sortm.c viamail.c
Log message:
Return type of (*done)() changed to void. default_done() replaced by
exit(). All dead code "return 1" lines removed from *_done()s and
replaced
by explicit "return 1" following done() calls in main()s (they should
never be reached). This should make cleaning up program termination
structures easier.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/ChangeLog?cvsroot=nmh&r1=1.249&r2=1.250
http://cvs.savannah.gnu.org/viewcvs/nmh/h/mh.h?cvsroot=nmh&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/nmh/sbr/done.c?cvsroot=nmh&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/ali.c?cvsroot=nmh&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/anno.c?cvsroot=nmh&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/ap.c?cvsroot=nmh&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/burst.c?cvsroot=nmh&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/comp.c?cvsroot=nmh&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/conflict.c?cvsroot=nmh&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/dist.c?cvsroot=nmh&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/dp.c?cvsroot=nmh&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/flist.c?cvsroot=nmh&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/fmtdump.c?cvsroot=nmh&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/folder.c?cvsroot=nmh&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/forw.c?cvsroot=nmh&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/inc.c?cvsroot=nmh&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/install-mh.c?cvsroot=nmh&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/mark.c?cvsroot=nmh&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/mhbuild.c?cvsroot=nmh&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/mhbuildsbr.c?cvsroot=nmh&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/mhfree.c?cvsroot=nmh&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/mhl.c?cvsroot=nmh&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/mhlist.c?cvsroot=nmh&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/mhn.c?cvsroot=nmh&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/mhparam.c?cvsroot=nmh&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/mhparse.c?cvsroot=nmh&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/mhpath.c?cvsroot=nmh&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/mhshow.c?cvsroot=nmh&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/mhstore.c?cvsroot=nmh&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/mhtest.c?cvsroot=nmh&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/msgchk.c?cvsroot=nmh&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/msh.c?cvsroot=nmh&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/packf.c?cvsroot=nmh&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/pick.c?cvsroot=nmh&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/post.c?cvsroot=nmh&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/prompter.c?cvsroot=nmh&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/rcvdist.c?cvsroot=nmh&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/rcvpack.c?cvsroot=nmh&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/rcvstore.c?cvsroot=nmh&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/refile.c?cvsroot=nmh&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/repl.c?cvsroot=nmh&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/rmf.c?cvsroot=nmh&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/rmm.c?cvsroot=nmh&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/scan.c?cvsroot=nmh&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/send.c?cvsroot=nmh&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/sendsbr.c?cvsroot=nmh&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/slocal.c?cvsroot=nmh&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/sortm.c?cvsroot=nmh&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/viamail.c?cvsroot=nmh&r1=1.10&r2=1.11
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/nmh/nmh/ChangeLog,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -b -r1.249 -r1.250
--- ChangeLog 21 Aug 2007 21:19:39 -0000 1.249
+++ ChangeLog 4 Nov 2007 11:54:32 -0000 1.250
@@ -1,3 +1,10 @@
+2007-11-04 Joel Reicher <address@hidden>
+
+ * Changed done() link overriding to function pointer. Return type
+ is now void so that exit() can be used as done() callback. Dead
+ code return from all done()s removed, with return 1 in main()
+ following done() (should never be reached).
+
2007-08-21 Josh Bressers <address@hidden>
* Red Hat Bug #253342: inc.c, utils.c, utils.h: When inc is run with
Index: h/mh.h
===================================================================
RCS file: /sources/nmh/nmh/h/mh.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- h/mh.h 4 Nov 2007 04:47:17 -0000 1.7
+++ h/mh.h 4 Nov 2007 11:54:32 -0000 1.8
@@ -2,7 +2,7 @@
/*
* mh.h -- main header file for all of nmh
*
- * $Id: mh.h,v 1.7 2007/11/04 04:47:17 jjr Exp $
+ * $Id: mh.h,v 1.8 2007/11/04 11:54:32 jjr Exp $
*/
#include <h/nmh.h>
@@ -336,7 +336,7 @@
extern char *whatnowproc;
extern char *whomproc;
-extern int (*done) (int);
+extern void (*done) (int);
#include <h/prototypes.h>
Index: sbr/done.c
===================================================================
RCS file: /sources/nmh/nmh/sbr/done.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- sbr/done.c 4 Nov 2007 04:47:17 -0000 1.4
+++ sbr/done.c 4 Nov 2007 11:54:33 -0000 1.5
@@ -2,7 +2,7 @@
/*
* done.c -- terminate the program
*
- * $Id: done.c,v 1.4 2007/11/04 04:47:17 jjr Exp $
+ * $Id: done.c,v 1.5 2007/11/04 11:54:33 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -11,11 +11,4 @@
#include <h/mh.h>
-int (*done) (int) = default_done;
-
-int
-default_done (int status)
-{
- exit (status);
- return 1; /* dead code to satisfy the compiler */
-}
+void (*done) (int) = exit;
Index: uip/ali.c
===================================================================
RCS file: /sources/nmh/nmh/uip/ali.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- uip/ali.c 13 Apr 2006 14:24:41 -0000 1.10
+++ uip/ali.c 4 Nov 2007 11:54:33 -0000 1.11
@@ -2,7 +2,7 @@
/*
* ali.c -- list nmh mail aliases
*
- * $Id: ali.c,v 1.10 2006/04/13 14:24:41 jjr Exp $
+ * $Id: ali.c,v 1.11 2007/11/04 11:54:33 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -170,7 +170,8 @@
}
}
- return done (0);
+ done (0);
+ return 1;
}
static void
Index: uip/anno.c
===================================================================
RCS file: /sources/nmh/nmh/uip/anno.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- uip/anno.c 13 Apr 2007 11:53:08 -0000 1.11
+++ uip/anno.c 4 Nov 2007 11:54:33 -0000 1.12
@@ -2,7 +2,7 @@
/*
* anno.c -- annotate messages
*
- * $Id: anno.c,v 1.11 2007/04/13 11:53:08 jjr Exp $
+ * $Id: anno.c,v 1.12 2007/11/04 11:54:33 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -236,7 +236,8 @@
else
annotate (draft, comp, text, inplace, datesw, delete, append);
- return (done(0));
+ done(0);
+ return 1;
}
#ifdef UCI
@@ -285,7 +286,8 @@
seq_save (mp); /* synchronize message sequences */
folder_free (mp); /* free folder/message structure */
context_save (); /* save the context file */
- return done (0);
+ done (0);
+ return 1;
}
static void
Index: uip/ap.c
===================================================================
RCS file: /sources/nmh/nmh/uip/ap.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- uip/ap.c 2 Jul 2002 22:09:14 -0000 1.7
+++ uip/ap.c 4 Nov 2007 11:54:33 -0000 1.8
@@ -2,7 +2,7 @@
/*
* ap.c -- parse addresses 822-style
*
- * $Id: ap.c,v 1.7 2002/07/02 22:09:14 kenh Exp $
+ * $Id: ap.c,v 1.8 2007/11/04 11:54:33 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -151,7 +151,8 @@
for (addrp = 0; addrs[addrp]; addrp++)
status += process (addrs[addrp], width, normalize);
- return done (status);
+ done (status);
+ return 1;
}
struct pqpair {
Index: uip/burst.c
===================================================================
RCS file: /sources/nmh/nmh/uip/burst.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- uip/burst.c 27 Apr 2006 12:00:28 -0000 1.6
+++ uip/burst.c 4 Nov 2007 11:54:33 -0000 1.7
@@ -2,7 +2,7 @@
/*
* burst.c -- explode digests into individual messages
*
- * $Id: burst.c,v 1.6 2006/04/27 12:00:28 jjr Exp $
+ * $Id: burst.c,v 1.7 2007/11/04 11:54:33 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -189,7 +189,8 @@
seq_save (mp); /* synchronize message sequences */
context_save (); /* save the context file */
folder_free (mp); /* free folder/message structure */
- return done (0);
+ done (0);
+ return 1;
}
Index: uip/comp.c
===================================================================
RCS file: /sources/nmh/nmh/uip/comp.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- uip/comp.c 27 Apr 2006 12:00:28 -0000 1.6
+++ uip/comp.c 4 Nov 2007 11:54:33 -0000 1.7
@@ -2,7 +2,7 @@
/*
* comp.c -- compose a message
*
- * $Id: comp.c,v 1.6 2006/04/27 12:00:28 jjr Exp $
+ * $Id: comp.c,v 1.7 2007/11/04 11:54:33 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -296,5 +296,6 @@
if (nwhat)
done (0);
what_now (ed, nedit, use, drft, NULL, 0, NULLMP, NULL, 0, cwd);
- return done (1);
+ done (1);
+ return 1;
}
Index: uip/conflict.c
===================================================================
RCS file: /sources/nmh/nmh/uip/conflict.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- uip/conflict.c 2 Jan 2006 03:25:18 -0000 1.8
+++ uip/conflict.c 4 Nov 2007 11:54:33 -0000 1.9
@@ -2,7 +2,7 @@
/*
* conflict.c -- check for conflicts in mail system
*
- * $Id: conflict.c,v 1.8 2006/01/02 03:25:18 bress Exp $
+ * $Id: conflict.c,v 1.9 2007/11/04 11:54:33 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -139,7 +139,8 @@
#endif /* UCI */
maildrops ();
- return done (0);
+ done (0);
+ return 1;
}
Index: uip/dist.c
===================================================================
RCS file: /sources/nmh/nmh/uip/dist.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- uip/dist.c 27 Apr 2006 12:00:28 -0000 1.6
+++ uip/dist.c 4 Nov 2007 11:54:33 -0000 1.7
@@ -2,7 +2,7 @@
/*
* dist.c -- re-distribute a message
*
- * $Id: dist.c,v 1.6 2006/04/27 12:00:28 jjr Exp $
+ * $Id: dist.c,v 1.7 2007/11/04 11:54:33 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -285,5 +285,6 @@
done (0);
what_now (ed, nedit, NOUSE, drft, msgnam, 1, mp,
anot ? "Resent" : NULL, inplace, cwd);
- return done (1);
+ done (1);
+ return 1;
}
Index: uip/dp.c
===================================================================
RCS file: /sources/nmh/nmh/uip/dp.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- uip/dp.c 2 Jul 2002 22:09:14 -0000 1.5
+++ uip/dp.c 4 Nov 2007 11:54:33 -0000 1.6
@@ -2,7 +2,7 @@
/*
* dp.c -- parse dates 822-style
*
- * $Id: dp.c,v 1.5 2002/07/02 22:09:14 kenh Exp $
+ * $Id: dp.c,v 1.6 2007/11/04 11:54:33 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -136,7 +136,8 @@
status += process (dates[datep], width);
context_save (); /* save the context file */
- return done (status);
+ done (status);
+ return 1;
}
Index: uip/flist.c
===================================================================
RCS file: /sources/nmh/nmh/uip/flist.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- uip/flist.c 13 Apr 2007 11:53:08 -0000 1.11
+++ uip/flist.c 4 Nov 2007 11:54:33 -0000 1.12
@@ -13,7 +13,7 @@
* makes no warranty about the software, its performance or its conformity to
* any specification.
*
- * $Id: flist.c,v 1.11 2007/04/13 11:53:08 jjr Exp $
+ * $Id: flist.c,v 1.12 2007/11/04 11:54:33 jjr Exp $
*/
#include <h/mh.h>
@@ -276,7 +276,8 @@
ScanFolders();
qsort(folders, nFolders, sizeof(struct Folder), (qsort_comp)
CompareFolders);
PrintFolders();
- return done (0);
+ done (0);
+ return 1;
}
/*
Index: uip/fmtdump.c
===================================================================
RCS file: /sources/nmh/nmh/uip/fmtdump.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- uip/fmtdump.c 11 Aug 2003 01:20:52 -0000 1.6
+++ uip/fmtdump.c 4 Nov 2007 11:54:33 -0000 1.7
@@ -2,7 +2,7 @@
/*
* fmtdump.c -- compile format file and dump out instructions
*
- * $Id: fmtdump.c,v 1.6 2003/08/11 01:20:52 jchonig Exp $
+ * $Id: fmtdump.c,v 1.7 2007/11/04 11:54:33 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -106,7 +106,8 @@
ncomps = fmt_compile(nfs, &fmt);
fmt_dump(fmt);
- return done(0);
+ done(0);
+ return 1;
}
static void
Index: uip/folder.c
===================================================================
RCS file: /sources/nmh/nmh/uip/folder.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- uip/folder.c 27 Apr 2006 12:00:28 -0000 1.12
+++ uip/folder.c 4 Nov 2007 11:54:33 -0000 1.13
@@ -4,7 +4,7 @@
* -- push/pop a folder onto/from the folder stack
* -- list the folder stack
*
- * $Id: folder.c,v 1.12 2006/04/27 12:00:28 jjr Exp $
+ * $Id: folder.c,v 1.13 2007/11/04 11:54:33 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -405,7 +405,8 @@
print_folders();
context_save (); /* save the context file */
- return done (0);
+ done (0);
+ return 1;
}
/*
Index: uip/forw.c
===================================================================
RCS file: /sources/nmh/nmh/uip/forw.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- uip/forw.c 21 Mar 2007 00:21:10 -0000 1.10
+++ uip/forw.c 4 Nov 2007 11:54:34 -0000 1.11
@@ -2,7 +2,7 @@
/*
* forw.c -- forward a message, or group of messages.
*
- * $Id: forw.c,v 1.10 2007/03/21 00:21:10 pm215 Exp $
+ * $Id: forw.c,v 1.11 2007/11/04 11:54:34 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -444,7 +444,8 @@
done (0);
what_now (ed, nedit, NOUSE, drft, NULL, 0, mp,
anot ? "Forwarded" : NULL, inplace, cwd);
- return done (1);
+ done (1);
+ return 1;
}
Index: uip/inc.c
===================================================================
RCS file: /sources/nmh/nmh/uip/inc.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- uip/inc.c 4 Nov 2007 04:47:18 -0000 1.25
+++ uip/inc.c 4 Nov 2007 11:54:34 -0000 1.26
@@ -2,7 +2,7 @@
/*
* inc.c -- incorporate messages from a maildrop into a folder
*
- * $Id: inc.c,v 1.25 2007/11/04 04:47:18 jjr Exp $
+ * $Id: inc.c,v 1.26 2007/11/04 11:54:34 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -223,7 +223,7 @@
*/
char *map_name(char *);
-static int inc_done(int);
+static void inc_done(int);
#ifdef POP
static int pop_action(char *);
static int pop_pack(char *);
@@ -952,7 +952,8 @@
seq_setunseen (mp, 0); /* set the Unseen-Sequence */
seq_save (mp); /* synchronize sequences */
context_save (); /* save the context file */
- return done (0);
+ done (0);
+ return 1;
}
@@ -989,7 +990,7 @@
#endif /* if 0 */
-static int
+static void
inc_done (int status)
{
#ifdef POP
@@ -1003,7 +1004,6 @@
DROPGROUPPRIVS();
}
exit (status);
- return 1; /* dead code to satisfy the compiler */
}
#ifdef POP
Index: uip/install-mh.c
===================================================================
RCS file: /sources/nmh/nmh/uip/install-mh.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- uip/install-mh.c 2 Jan 2006 03:17:42 -0000 1.6
+++ uip/install-mh.c 4 Nov 2007 11:54:34 -0000 1.7
@@ -1,7 +1,7 @@
/*
* install-mh.c -- initialize the nmh environment of a new user
*
- * $Id: install-mh.c,v 1.6 2006/01/02 03:17:42 bress Exp $
+ * $Id: install-mh.c,v 1.7 2007/11/04 11:54:34 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -213,7 +213,8 @@
fprintf (out, "%s: %s\n", np->n_name, np->n_field);
}
fclose (out);
- return done (0);
+ done (0);
+ return 1;
}
Index: uip/mark.c
===================================================================
RCS file: /sources/nmh/nmh/uip/mark.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- uip/mark.c 27 Apr 2006 12:00:28 -0000 1.8
+++ uip/mark.c 4 Nov 2007 11:54:34 -0000 1.9
@@ -4,7 +4,7 @@
* -- delete messages (s) from sequences in given folder
* -- list sequences in given folder
*
- * $Id: mark.c,v 1.8 2006/04/27 12:00:28 jjr Exp $
+ * $Id: mark.c,v 1.9 2007/11/04 11:54:34 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -228,7 +228,8 @@
context_replace (pfolder, folder); /* update current folder */
context_save (); /* save the context file */
folder_free (mp); /* free folder/message structure */
- return done (0);
+ done (0);
+ return 1;
}
Index: uip/mhbuild.c
===================================================================
RCS file: /sources/nmh/nmh/uip/mhbuild.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- uip/mhbuild.c 4 Nov 2007 04:47:18 -0000 1.11
+++ uip/mhbuild.c 4 Nov 2007 11:54:34 -0000 1.12
@@ -2,7 +2,7 @@
/*
* mhbuild.c -- expand/translate MIME composition files
*
- * $Id: mhbuild.c,v 1.11 2007/11/04 04:47:18 jjr Exp $
+ * $Id: mhbuild.c,v 1.12 2007/11/04 11:54:34 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -100,7 +100,7 @@
static char outfile[BUFSIZ];
static int unlink_outfile = 0;
-static int unlink_done (int);
+static void unlink_done (int);
/* mhbuildsbr.c */
CT build_mime (char *);
@@ -381,11 +381,12 @@
unlink_outfile = 0;
free_content (ct);
- return done (0);
+ done (0);
+ return 1;
}
-static int
+static void
unlink_done (int status)
{
/*
@@ -398,5 +399,4 @@
unlink (outfile);
exit (status);
- return 1; /* dead code to satisfy the compiler */
}
Index: uip/mhbuildsbr.c
===================================================================
RCS file: /sources/nmh/nmh/uip/mhbuildsbr.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- uip/mhbuildsbr.c 13 Apr 2007 11:53:08 -0000 1.16
+++ uip/mhbuildsbr.c 4 Nov 2007 11:54:34 -0000 1.17
@@ -2,7 +2,7 @@
/*
* mhbuildsbr.c -- routines to expand/translate MIME composition files
*
- * $Id: mhbuildsbr.c,v 1.16 2007/04/13 11:53:08 jjr Exp $
+ * $Id: mhbuildsbr.c,v 1.17 2007/11/04 11:54:34 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -244,7 +244,8 @@
fflush (stdout);
fflush (stderr);
- return done (1);
+ done (1);
+ return 1;
}
Index: uip/mhfree.c
===================================================================
RCS file: /sources/nmh/nmh/uip/mhfree.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- uip/mhfree.c 4 Nov 2007 08:52:17 -0000 1.6
+++ uip/mhfree.c 4 Nov 2007 11:54:34 -0000 1.7
@@ -3,7 +3,7 @@
* mhfree.c -- routines to free the data structures used to
* -- represent MIME messages
*
- * $Id: mhfree.c,v 1.6 2007/11/04 08:52:17 jjr Exp $
+ * $Id: mhfree.c,v 1.7 2007/11/04 11:54:34 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -25,7 +25,7 @@
void free_header (CT);
void free_ctinfo (CT);
void free_encoding (CT, int);
-int freects_done (int);
+void freects_done (int);
/*
* static prototypes
@@ -287,7 +287,7 @@
}
-int
+void
freects_done (int status)
{
CT *ctp;
@@ -297,5 +297,4 @@
free_content (*ctp);
exit (status);
- return 1; /* dead code to satisfy the compiler */
}
Index: uip/mhl.c
===================================================================
RCS file: /sources/nmh/nmh/uip/mhl.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- uip/mhl.c 2 Jul 2002 22:09:14 -0000 1.4
+++ uip/mhl.c 4 Nov 2007 11:54:34 -0000 1.5
@@ -2,7 +2,7 @@
/*
* mhl.c -- the nmh message listing program
*
- * $Id: mhl.c,v 1.4 2002/07/02 22:09:14 kenh Exp $
+ * $Id: mhl.c,v 1.5 2007/11/04 11:54:34 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -21,7 +21,8 @@
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
- return done (mhl (argc, argv));
+ done (mhl (argc, argv));
+ return 1;
}
Index: uip/mhlist.c
===================================================================
RCS file: /sources/nmh/nmh/uip/mhlist.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- uip/mhlist.c 4 Nov 2007 08:52:17 -0000 1.14
+++ uip/mhlist.c 4 Nov 2007 11:54:34 -0000 1.15
@@ -2,7 +2,7 @@
/*
* mhlist.c -- list the contents of MIME messages
*
- * $Id: mhlist.c,v 1.14 2007/11/04 08:52:17 jjr Exp $
+ * $Id: mhlist.c,v 1.15 2007/11/04 11:54:34 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -110,7 +110,7 @@
/* mhfree.c */
void free_content (CT);
extern CT *cts;
-int freects_done (int);
+void freects_done (int);
/*
* static prototypes
@@ -373,7 +373,8 @@
context_save (); /* save the context file */
}
- return done (0);
+ done (0);
+ return 1;
}
Index: uip/mhn.c
===================================================================
RCS file: /sources/nmh/nmh/uip/mhn.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- uip/mhn.c 4 Nov 2007 08:52:17 -0000 1.14
+++ uip/mhn.c 4 Nov 2007 11:54:34 -0000 1.15
@@ -2,7 +2,7 @@
/*
* mhn.c -- display, list, cache, or store the contents of MIME messages
*
- * $Id: mhn.c,v 1.14 2007/11/04 08:52:17 jjr Exp $
+ * $Id: mhn.c,v 1.15 2007/11/04 11:54:34 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -198,7 +198,7 @@
/* mhfree.c */
void free_content (CT);
extern CT *cts;
-int freects_done (int);
+void freects_done (int);
/*
* static prototypes
@@ -686,7 +686,8 @@
context_save (); /* save the context file */
}
- return done (0);
+ done (0);
+ return 1;
}
Index: uip/mhparam.c
===================================================================
RCS file: /sources/nmh/nmh/uip/mhparam.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- uip/mhparam.c 8 Mar 2006 12:14:16 -0000 1.5
+++ uip/mhparam.c 4 Nov 2007 11:54:34 -0000 1.6
@@ -5,7 +5,7 @@
* Originally contributed by
* Jeffrey C Honig <address@hidden>
*
- * $Id: mhparam.c,v 1.5 2006/03/08 12:14:16 bress Exp $
+ * $Id: mhparam.c,v 1.6 2007/11/04 11:54:34 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -181,7 +181,8 @@
}
}
- return done (missed);
+ done (missed);
+ return 1;
}
Index: uip/mhparse.c
===================================================================
RCS file: /sources/nmh/nmh/uip/mhparse.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- uip/mhparse.c 13 Apr 2007 11:53:08 -0000 1.16
+++ uip/mhparse.c 4 Nov 2007 11:54:35 -0000 1.17
@@ -2,7 +2,7 @@
/*
* mhparse.c -- routines to parse the contents of MIME messages
*
- * $Id: mhparse.c,v 1.16 2007/04/13 11:53:08 jjr Exp $
+ * $Id: mhparse.c,v 1.17 2007/11/04 11:54:35 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -209,7 +209,8 @@
fflush (stdout);
fflush (stderr);
- return done (1);
+ done (1);
+ return 1;
}
Index: uip/mhpath.c
===================================================================
RCS file: /sources/nmh/nmh/uip/mhpath.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- uip/mhpath.c 27 Apr 2006 12:00:28 -0000 1.8
+++ uip/mhpath.c 4 Nov 2007 11:54:35 -0000 1.9
@@ -2,7 +2,7 @@
/*
* mhpath.c -- print full pathnames of nmh messages and folders
*
- * $Id: mhpath.c,v 1.8 2006/04/27 12:00:28 jjr Exp $
+ * $Id: mhpath.c,v 1.9 2007/11/04 11:54:35 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -123,5 +123,6 @@
seq_save (mp); /* synchronize message sequences */
context_save (); /* save the context file */
folder_free (mp); /* free folder/message structure */
- return done (0);
+ done (0);
+ return 1;
}
Index: uip/mhshow.c
===================================================================
RCS file: /sources/nmh/nmh/uip/mhshow.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- uip/mhshow.c 4 Nov 2007 08:52:17 -0000 1.14
+++ uip/mhshow.c 4 Nov 2007 11:54:35 -0000 1.15
@@ -2,7 +2,7 @@
/*
* mhshow.c -- display the contents of MIME messages
*
- * $Id: mhshow.c,v 1.14 2007/11/04 08:52:17 jjr Exp $
+ * $Id: mhshow.c,v 1.15 2007/11/04 11:54:35 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -126,7 +126,7 @@
/* mhfree.c */
void free_content (CT);
extern CT *cts;
-int freects_done (int);
+void freects_done (int);
/*
* static prototypes
@@ -453,7 +453,8 @@
context_save (); /* save the context file */
}
- return done (0);
+ done (0);
+ return 1;
}
Index: uip/mhstore.c
===================================================================
RCS file: /sources/nmh/nmh/uip/mhstore.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- uip/mhstore.c 4 Nov 2007 08:52:17 -0000 1.14
+++ uip/mhstore.c 4 Nov 2007 11:54:35 -0000 1.15
@@ -2,7 +2,7 @@
/*
* mhstore.c -- store the contents of MIME messages
*
- * $Id: mhstore.c,v 1.14 2007/11/04 08:52:17 jjr Exp $
+ * $Id: mhstore.c,v 1.15 2007/11/04 11:54:35 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -104,7 +104,7 @@
/* mhfree.c */
void free_content (CT);
extern CT *cts;
-int freects_done (int);
+void freects_done (int);
/*
* static prototypes
@@ -385,7 +385,8 @@
context_save (); /* save the context file */
}
- return done (0);
+ done (0);
+ return 1;
}
Index: uip/mhtest.c
===================================================================
RCS file: /sources/nmh/nmh/uip/mhtest.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- uip/mhtest.c 4 Nov 2007 08:52:17 -0000 1.14
+++ uip/mhtest.c 4 Nov 2007 11:54:35 -0000 1.15
@@ -2,7 +2,7 @@
/*
* mhtest.c -- test harness for MIME routines
*
- * $Id: mhtest.c,v 1.14 2007/11/04 08:52:17 jjr Exp $
+ * $Id: mhtest.c,v 1.15 2007/11/04 11:54:35 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -106,7 +106,7 @@
/* mhfree.c */
void free_content (CT);
extern CT *cts;
-int freects_done (int);
+void freects_done (int);
/*
* static prototypes
@@ -364,7 +364,8 @@
context_save (); /* save the context file */
}
- return done (0);
+ done (0);
+ return 1;
}
Index: uip/msgchk.c
===================================================================
RCS file: /sources/nmh/nmh/uip/msgchk.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- uip/msgchk.c 14 Apr 2006 08:21:35 -0000 1.12
+++ uip/msgchk.c 4 Nov 2007 11:54:35 -0000 1.13
@@ -2,7 +2,7 @@
/*
* msgchk.c -- check for mail
*
- * $Id: msgchk.c,v 1.12 2006/04/14 08:21:35 jjr Exp $
+ * $Id: msgchk.c,v 1.13 2007/11/04 11:54:35 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -327,7 +327,8 @@
} /* host == NULL */
#endif
- return done (status);
+ done (status);
+ return 1;
}
Index: uip/msh.c
===================================================================
RCS file: /sources/nmh/nmh/uip/msh.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- uip/msh.c 13 Apr 2007 11:53:08 -0000 1.12
+++ uip/msh.c 4 Nov 2007 11:54:35 -0000 1.13
@@ -2,7 +2,7 @@
/*
* msh.c -- The nmh shell
*
- * $Id: msh.c,v 1.12 2007/04/13 11:53:08 jjr Exp $
+ * $Id: msh.c,v 1.13 2007/11/04 11:54:35 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -413,7 +413,8 @@
m_reset ();
- return done (0);
+ done (0);
+ return 1;
}
Index: uip/packf.c
===================================================================
RCS file: /sources/nmh/nmh/uip/packf.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- uip/packf.c 4 Nov 2007 04:47:18 -0000 1.10
+++ uip/packf.c 4 Nov 2007 11:54:35 -0000 1.11
@@ -2,7 +2,7 @@
/*
* packf.c -- pack a nmh folder into a file
*
- * $Id: packf.c,v 1.10 2007/11/04 04:47:18 jjr Exp $
+ * $Id: packf.c,v 1.11 2007/11/04 11:54:35 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -33,7 +33,7 @@
static int mbx_style = MBOX_FORMAT;
static int mapping = 0;
-static int mbxclose_done(int);
+static void mbxclose_done(int);
char *file = NULL;
@@ -179,13 +179,13 @@
seq_save (mp);
context_save (); /* save the context file */
folder_free (mp); /* free folder/message structure */
- return done (0);
+ done (0);
+ return 1;
}
-static int
+static void
mbxclose_done (int status)
{
mbx_close (file, md);
exit (status);
- return 1; /* dead code to satisfy the compiler */
}
Index: uip/pick.c
===================================================================
RCS file: /sources/nmh/nmh/uip/pick.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- uip/pick.c 4 Nov 2007 04:47:18 -0000 1.11
+++ uip/pick.c 4 Nov 2007 11:54:35 -0000 1.12
@@ -2,7 +2,7 @@
/*
* pick.c -- search for messages by content
*
- * $Id: pick.c,v 1.11 2007/11/04 04:47:18 jjr Exp $
+ * $Id: pick.c,v 1.12 2007/11/04 11:54:35 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -68,7 +68,7 @@
static int listsw = -1;
-static int putzero_done (int);
+static void putzero_done (int);
int
main (int argc, char **argv)
@@ -286,15 +286,15 @@
seq_save (mp); /* synchronize message sequences */
context_save (); /* save the context file */
folder_free (mp); /* free folder/message structure */
- return done (0);
+ done (0);
+ return 1;
}
-static int
+static void
putzero_done (int status)
{
if (listsw && status && !isatty (fileno (stdout)))
printf ("0\n");
exit (status);
- return 1; /* dead code to satisfy the compiler */
}
Index: uip/post.c
===================================================================
RCS file: /sources/nmh/nmh/uip/post.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- uip/post.c 17 Apr 2007 04:53:54 -0000 1.21
+++ uip/post.c 4 Nov 2007 11:54:35 -0000 1.22
@@ -2,7 +2,7 @@
/*
* post.c -- enter messages into the mail transport system
*
- * $Id: post.c,v 1.21 2007/04/17 04:53:54 jjr Exp $
+ * $Id: post.c,v 1.22 2007/11/04 11:54:35 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -639,7 +639,8 @@
if (verbose)
printf (partno ? "Partial Message #%s Processed\n" : "Message
Processed\n",
partno);
- return done (0);
+ done (0);
+ return 1;
}
Index: uip/prompter.c
===================================================================
RCS file: /sources/nmh/nmh/uip/prompter.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- uip/prompter.c 30 Sep 2003 16:58:43 -0000 1.5
+++ uip/prompter.c 4 Nov 2007 11:54:35 -0000 1.6
@@ -2,7 +2,7 @@
/*
* prompter.c -- simple prompting editor front-end
*
- * $Id: prompter.c,v 1.5 2003/09/30 16:58:43 gbburkhardt Exp $
+ * $Id: prompter.c,v 1.6 2007/11/04 11:54:35 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -400,7 +400,8 @@
unlink (tmpfil);
context_save (); /* save the context file */
- return done (0);
+ done (0);
+ return 1;
}
Index: uip/rcvdist.c
===================================================================
RCS file: /sources/nmh/nmh/uip/rcvdist.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- uip/rcvdist.c 4 Nov 2007 04:47:18 -0000 1.11
+++ uip/rcvdist.c 4 Nov 2007 11:54:35 -0000 1.12
@@ -2,7 +2,7 @@
/*
* rcvdist.c -- asynchronously redistribute messages
*
- * $Id: rcvdist.c,v 1.11 2007/11/04 04:47:18 jjr Exp $
+ * $Id: rcvdist.c,v 1.12 2007/11/04 11:54:35 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -34,7 +34,7 @@
* prototypes
*/
static void rcvdistout (FILE *, char *, char *);
-static int unlink_done (int);
+static void unlink_done (int);
int
@@ -270,7 +270,7 @@
}
-static int
+static void
unlink_done (int status)
{
if (backup[0])
@@ -281,5 +281,4 @@
unlink (tmpfil);
exit (status ? RCV_MBX : RCV_MOK);
- return 1; /* dead code to satisfy the compiler */
}
Index: uip/rcvpack.c
===================================================================
RCS file: /sources/nmh/nmh/uip/rcvpack.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- uip/rcvpack.c 2 Jul 2002 22:09:15 -0000 1.7
+++ uip/rcvpack.c 4 Nov 2007 11:54:35 -0000 1.8
@@ -2,7 +2,7 @@
/*
* rcvpack.c -- append message to a file
*
- * $Id: rcvpack.c,v 1.7 2002/07/02 22:09:15 kenh Exp $
+ * $Id: rcvpack.c,v 1.8 2007/11/04 11:54:35 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -103,5 +103,6 @@
if (mbx_close (file, md) == NOTOK)
done (RCV_MBX);
- return done (RCV_MOK);
+ done (RCV_MOK);
+ return 1;
}
Index: uip/rcvstore.c
===================================================================
RCS file: /sources/nmh/nmh/uip/rcvstore.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- uip/rcvstore.c 4 Nov 2007 04:47:18 -0000 1.12
+++ uip/rcvstore.c 4 Nov 2007 11:54:36 -0000 1.13
@@ -2,7 +2,7 @@
/*
* rcvstore.c -- asynchronously add mail to a folder
*
- * $Id: rcvstore.c,v 1.12 2007/11/04 04:47:18 jjr Exp $
+ * $Id: rcvstore.c,v 1.13 2007/11/04 11:54:36 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -48,7 +48,7 @@
*/
static char *tmpfilenam = NULL;
-static int unlink_done(int);
+static void unlink_done(int);
int
main (int argc, char **argv)
@@ -225,17 +225,17 @@
unlink (tmpfilenam); /* remove temporary file */
tmpfilenam = NULL;
- return done (0);
+ done (0);
+ return 1;
}
/*
* Clean up and exit
*/
-static int
+static void
unlink_done(int status)
{
if (tmpfilenam && *tmpfilenam)
unlink (tmpfilenam);
exit (status);
- return 1; /* dead code to satisfy the compiler */
}
Index: uip/refile.c
===================================================================
RCS file: /sources/nmh/nmh/uip/refile.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- uip/refile.c 27 Apr 2006 12:00:28 -0000 1.13
+++ uip/refile.c 4 Nov 2007 11:54:36 -0000 1.14
@@ -3,7 +3,7 @@
* refile.c -- move or link message(s) from a source folder
* -- into one or more destination folders
*
- * $Id: refile.c,v 1.13 2006/04/27 12:00:28 jjr Exp $
+ * $Id: refile.c,v 1.14 2007/11/04 11:54:36 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -266,7 +266,8 @@
context_replace (pfolder, folder); /* update current folder */
context_save (); /* save the context file */
folder_free (mp); /* free folder structure */
- return done (0);
+ done (0);
+ return 1;
}
Index: uip/repl.c
===================================================================
RCS file: /sources/nmh/nmh/uip/repl.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- uip/repl.c 27 Apr 2006 12:00:28 -0000 1.8
+++ uip/repl.c 4 Nov 2007 11:54:36 -0000 1.9
@@ -2,7 +2,7 @@
/*
* repl.c -- reply to a message
*
- * $Id: repl.c,v 1.8 2006/04/27 12:00:28 jjr Exp $
+ * $Id: repl.c,v 1.9 2007/11/04 11:54:36 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -442,7 +442,8 @@
done (0);
what_now (ed, nedit, NOUSE, drft, msg, 0, mp,
anot ? "Replied" : NULL, inplace, cwd);
- return done (1);
+ done (1);
+ return 1;
}
void
Index: uip/rmf.c
===================================================================
RCS file: /sources/nmh/nmh/uip/rmf.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- uip/rmf.c 27 Apr 2006 12:00:28 -0000 1.8
+++ uip/rmf.c 4 Nov 2007 11:54:36 -0000 1.9
@@ -2,7 +2,7 @@
/*
* rmf.c -- remove a folder
*
- * $Id: rmf.c,v 1.8 2006/04/27 12:00:28 jjr Exp $
+ * $Id: rmf.c,v 1.9 2007/11/04 11:54:36 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -122,7 +122,8 @@
}
}
context_save (); /* save the context file */
- return done (0);
+ done (0);
+ return 1;
}
static int
Index: uip/rmm.c
===================================================================
RCS file: /sources/nmh/nmh/uip/rmm.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- uip/rmm.c 27 Apr 2006 12:00:28 -0000 1.9
+++ uip/rmm.c 4 Nov 2007 11:54:36 -0000 1.10
@@ -2,7 +2,7 @@
/*
* rmm.c -- remove a message(s)
*
- * $Id: rmm.c,v 1.9 2006/04/27 12:00:28 jjr Exp $
+ * $Id: rmm.c,v 1.10 2007/11/04 11:54:36 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -127,5 +127,6 @@
context_replace (pfolder, folder); /* update current folder */
context_save (); /* save the context file */
folder_free (mp); /* free folder structure */
- return done (0);
+ done (0);
+ return 1;
}
Index: uip/scan.c
===================================================================
RCS file: /sources/nmh/nmh/uip/scan.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- uip/scan.c 27 Apr 2006 12:00:28 -0000 1.14
+++ uip/scan.c 4 Nov 2007 11:54:36 -0000 1.15
@@ -2,7 +2,7 @@
/*
* scan.c -- display a one-line "scan" listing of folder or messages
*
- * $Id: scan.c,v 1.14 2006/04/27 12:00:28 jjr Exp $
+ * $Id: scan.c,v 1.15 2007/11/04 11:54:36 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -326,5 +326,6 @@
if (clearflag)
clear_screen ();
- return done (0);
+ done (0);
+ return 1;
}
Index: uip/send.c
===================================================================
RCS file: /sources/nmh/nmh/uip/send.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- uip/send.c 21 Feb 2006 03:58:31 -0000 1.8
+++ uip/send.c 4 Nov 2007 11:54:36 -0000 1.9
@@ -2,7 +2,7 @@
/*
* send.c -- send a composed message
*
- * $Id: send.c,v 1.8 2006/02/21 03:58:31 levine Exp $
+ * $Id: send.c,v 1.9 2007/11/04 11:54:36 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -473,5 +473,6 @@
}
context_save (); /* save the context file */
- return done (status);
+ done (status);
+ return 1;
}
Index: uip/sendsbr.c
===================================================================
RCS file: /sources/nmh/nmh/uip/sendsbr.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- uip/sendsbr.c 4 Nov 2007 04:47:18 -0000 1.16
+++ uip/sendsbr.c 4 Nov 2007 11:54:36 -0000 1.17
@@ -2,7 +2,7 @@
/*
* sendsbr.c -- routines to help WhatNow/Send along
*
- * $Id: sendsbr.c,v 1.16 2007/11/04 04:47:18 jjr Exp $
+ * $Id: sendsbr.c,v 1.17 2007/11/04 11:54:36 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -60,7 +60,7 @@
/*
* static prototypes
*/
-static int armed_done (int);
+static void armed_done (int);
static void alert (char *, int);
static int tmp_fd (void);
static void anno (int, struct stat *);
@@ -153,7 +153,7 @@
break;
}
- done=default_done;
+ done=exit;
if (distfile)
unlink (distfile);
@@ -1074,11 +1074,10 @@
}
-static int
+static void
armed_done (int status)
{
longjmp (env, status ? status : NOTOK);
exit (status);
- return 1; /* dead code to satisfy the compiler */
}
Index: uip/slocal.c
===================================================================
RCS file: /sources/nmh/nmh/uip/slocal.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- uip/slocal.c 13 Apr 2007 11:53:08 -0000 1.24
+++ uip/slocal.c 4 Nov 2007 11:54:36 -0000 1.25
@@ -2,7 +2,7 @@
/*
* slocal.c -- asynchronously filter and deliver new mail
*
- * $Id: slocal.c,v 1.24 2007/04/13 11:53:08 jjr Exp $
+ * $Id: slocal.c,v 1.25 2007/11/04 11:54:36 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -412,7 +412,8 @@
/* deliver the message */
status = localmail (fd, mdlvr);
- return done (status != -1 ? RCV_MOK : RCV_MBX);
+ done (status != -1 ? RCV_MOK : RCV_MBX);
+ return 1;
}
Index: uip/sortm.c
===================================================================
RCS file: /sources/nmh/nmh/uip/sortm.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- uip/sortm.c 13 Apr 2007 11:53:08 -0000 1.14
+++ uip/sortm.c 4 Nov 2007 11:54:36 -0000 1.15
@@ -2,7 +2,7 @@
/*
* sortm.c -- sort messages in a folder by date/time
*
- * $Id: sortm.c,v 1.14 2007/04/13 11:53:08 jjr Exp $
+ * $Id: sortm.c,v 1.15 2007/11/04 11:54:36 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -285,7 +285,8 @@
seq_save (mp); /* synchronize message sequences */
context_save (); /* save the context file */
folder_free (mp); /* free folder/message structure */
- return done (0);
+ done (0);
+ return 1;
}
static int
Index: uip/viamail.c
===================================================================
RCS file: /sources/nmh/nmh/uip/viamail.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- uip/viamail.c 21 Feb 2006 03:58:31 -0000 1.10
+++ uip/viamail.c 4 Nov 2007 11:54:36 -0000 1.11
@@ -2,7 +2,7 @@
/*
* viamail.c -- send multiple files in a MIME message
*
- * $Id: viamail.c,v 1.10 2006/02/21 03:58:31 levine Exp $
+ * $Id: viamail.c,v 1.11 2007/11/04 11:54:36 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -248,5 +248,6 @@
fclose (fp);
if (unlink (tmpfil) == -1)
advise (NULL, "unable to remove temp file %s", tmpfil);
- return done (status);
+ done (status);
+ return 1;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Nmh-commits] nmh ChangeLog h/mh.h sbr/done.c uip/ali.c uip/a...,
Joel Reicher <=