When building on gcc, use noreturn attribute on adios and the various done

functions.

diff --git a/ChangeLog b/ChangeLog
index e08e6783d785eaa71a5a73a5e3f64d6495c5c243..785aeca1caa4e15ede3c55603c158d4706393db9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-06-02  Peter Maydell  <pmaydell@chiark.greenend.org.uk>
+
+       * h/mh.h, h/prototypes.h, sbr/done.c, uip/inc.c,
+       uip/mhbuild.c, uip/mhlist.c, uip/mhn.c, uip/mhshow.c,
+       uip/mhstore.c, uip/mhtest.c, uip/packf.c, uip/pick.c,
+       uip/rcvdist.c, uip/rcvstore.c, uip/sendsbr.c: when
+       building on gcc, use the noreturn attribute on various
+       functions (should improve code and avoid some spurious
+       'uninitialized variable' warnings).
+
 2008-06-01  Peter Maydell  <pmaydell@chiark.greenend.org.uk>
 
        * docs/README.developers: update the bits about doing a

diff --git a/h/mh.h b/h/mh.h
index 7cdbead2c44b9a380a616e39598c745ec7ea1839..97c7769b66faa19488db631f72f32376a13416b4 100644 (file)
--- a/h/mh.h
+++ b/h/mh.h
@@ -29,6 +29,15 @@
 #endif
 typedef unsigned char  boolean;  /* not int so we can pack in a structure */
 
+/* If we're using gcc then give it some information about
+ * functions that abort.
+ */
+#if __GNUC__ > 2
+#define NORETURN __attribute__((__noreturn__))
+#else
+#define NORETURN
+#endif
+
 /*
  * user context/profile structure
  */
@@ -336,7 +345,7 @@ extern char *vmhproc;
 extern char *whatnowproc;
 extern char *whomproc;
 
-extern void (*done) (int);
+extern void (*done) (int) NORETURN;
 
 #include <h/prototypes.h>
 

diff --git a/h/prototypes.h b/h/prototypes.h
index 52fab3aa7fe4e8dcf05fc2f2507bb78b88dc6cfc..d10346f3824d2a0e8b8665457c72a00aaaeaa3a4 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -25,7 +25,7 @@ char *etcpath(char *);
 /*
  * prototypes from the nmh subroutine library
  */
-void adios (char *, char *, ...);
+void adios (char *, char *, ...) NORETURN;
 void admonish (char *, char *, ...);
 void advertise (char *, char *, char *, va_list);
 void advise (char *, char *, ...);

diff --git a/sbr/done.c b/sbr/done.c
index 938fdb2d683d03db7d963aa5d3ffc1c67890d877..65ec1cb7da64f447cdf8061449c158e95ed044b5 100644 (file)
--- a/sbr/done.c
+++ b/sbr/done.c
@@ -11,4 +11,4 @@
 
 #include <h/mh.h>
 
-void (*done) (int) = exit;
+void (*done) (int) NORETURN = exit;

diff --git a/uip/inc.c b/uip/inc.c
index ef1b08febc408334e5467ca4db48f436b25be541..0fcff84016954cfc7143d80c84ce0e2670421fa7 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -223,7 +223,7 @@ static FILE *in;
  */
 char *map_name(char *);
 
-static void inc_done(int);
+static void inc_done(int) NORETURN;
 #ifdef POP
 static int pop_action(char *);
 static int pop_pack(char *);

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 2776f7c8d15011915f1caffafb8a9a4b76332922..a47022ee4260f92fc2b950ca657496087013c063 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -100,7 +100,7 @@ static int unlink_infile  = 0;
 static char outfile[BUFSIZ];
 static int unlink_outfile = 0;
 
-static void unlink_done (int);
+static void unlink_done (int) NORETURN;
 
 /* mhbuildsbr.c */
 CT build_mime (char *);

diff --git a/uip/mhlist.c b/uip/mhlist.c
index e8f8163b63ad0a83ba1f9a0f392ca05265fd4141..4bb21bb59fad65d366268c5dac6ec140b7ff70a6 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -110,7 +110,7 @@ void list_all_messages (CT *, int, int, int, int);
 /* mhfree.c */
 void free_content (CT);
 extern CT *cts;
-void freects_done (int);
+void freects_done (int) NORETURN;
 
 /*
  * static prototypes

diff --git a/uip/mhn.c b/uip/mhn.c
index 69554768c0ea205ef4ecf1163e99b262aef56292..376fc5834cd9196973caad2a891ad1f29c49958c 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -198,7 +198,7 @@ void cache_all_messages (CT *);
 /* mhfree.c */
 void free_content (CT);
 extern CT *cts;
-void freects_done (int);
+void freects_done (int) NORETURN;
 
 /*
  * static prototypes

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 1383388d5f158462f7b23721f74a5355b645a4dd..179173ef88a0edb42a15fcc261b343c090e980e0 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -126,7 +126,7 @@ void show_all_messages (CT *);
 /* mhfree.c */
 void free_content (CT);
 extern CT *cts;
-void freects_done (int);
+void freects_done (int) NORETURN;
 
 /*
  * static prototypes

diff --git a/uip/mhstore.c b/uip/mhstore.c
index bcebb7f2729e6096fc3d20c75a12698958d0cc34..91c57a22ac56a3688fd28230ddd604db15058c9b 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -104,7 +104,7 @@ void store_all_messages (CT *);
 /* mhfree.c */
 void free_content (CT);
 extern CT *cts;
-void freects_done (int);
+void freects_done (int) NORETURN;
 
 /*
  * static prototypes

diff --git a/uip/mhtest.c b/uip/mhtest.c
index fa42cd271a2af2eeaf003a2f74997431291abcf4..d8c025fa04a56113982dc350b2464fd08b04418c 100644 (file)
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -106,7 +106,7 @@ void flush_errors (void);
 /* mhfree.c */
 void free_content (CT);
 extern CT *cts;
-void freects_done (int);
+void freects_done (int) NORETURN;
 
 /*
  * static prototypes

diff --git a/uip/packf.c b/uip/packf.c
index fb8871d97dae7afb31570629a6152d7f594696c6..a696e727c9c0b0764c2e46827542bfb5409e8690 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -33,7 +33,7 @@ static int md = NOTOK;
 static int mbx_style = MBOX_FORMAT;
 static int mapping = 0;
 
-static void mbxclose_done(int);
+static void mbxclose_done(int) NORETURN;
 
 char *file = NULL;
 

diff --git a/uip/pick.c b/uip/pick.c
index ad356e3915ae7f2e56f55090d8d29b29b40057d6..2d9b76eb039545a6c5118257c3d492f341d2d60e 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -68,7 +68,7 @@ static struct swit switches[] = {
 
 static int listsw = -1;
 
-static void putzero_done (int);
+static void putzero_done (int) NORETURN;
 
 int
 main (int argc, char **argv)

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index b0a360977bfae8aa13b2b257be0be6d792efee78..7ee47fd92e0ce748b48f75bba9ec99716b43287d 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -34,7 +34,7 @@ static char tmpfil[BUFSIZ] = "";
  * prototypes
  */
 static void rcvdistout (FILE *, char *, char *);
-static void unlink_done (int);
+static void unlink_done (int) NORETURN;
 
 
 int

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 493badebc2eec2dd82ca23b9fae9c442c3e4f492..21f6c776d8bd4ad6d2af65a73f5c08b440c01796 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -48,7 +48,7 @@ static struct swit switches[] = {
  */
 static char *tmpfilenam = NULL;
 
-static void unlink_done(int);
+static void unlink_done(int) NORETURN;
 
 int
 main (int argc, char **argv)

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 877538bfb70d2cafd83c2c2630b4334b4db19804..fd21acd37e4fbf41e889416e129a327ec6242a69 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -60,7 +60,7 @@ char *getusername (void);
 /*
  * static prototypes
  */
-static void armed_done (int);
+static void armed_done (int) NORETURN;
 static void alert (char *, int);
 static int tmp_fd (void);
 static void anno (int, struct stat *);