X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/aeceb648abeaf47ad7cffcbe29f7044a9445bb8d..c347c3bb:/uip/mhn.c?ds=sidebyside

diff --git a/uip/mhn.c b/uip/mhn.c
index 39d86933..dd3cf871 100644
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -1,6 +1,4 @@
-
-/*
- * mhn.c -- display, list, cache, or store the contents of MIME messages
+/* mhn.c -- display, list, cache, or store the contents of MIME messages
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -61,8 +59,8 @@
      */					\
     X("build", -5, BUILDSW) \
     X("nobuild", -7, NBUILDSW) \
-    X("rfc934mode", -10, RFC934SW) \
-    X("norfc934mode", -12, NRFC934SW) \
+    X("rfc934mode", 0, RFC934SW) \
+    X("norfc934mode", 0, NRFC934SW) \
 
 #define X(sw, minchars, id) id,
 DEFINE_SWITCH_ENUM(MHN);
@@ -115,7 +113,7 @@ static int storesw = 0;
 CT parse_mime (char *);
 
 /* mhmisc.c */
-int part_ok (CT, int);
+int part_ok (CT);
 int type_ok (CT, int);
 void flush_errors (void);
 
@@ -277,8 +275,7 @@ do_cache:
 	    case FORMSW:
 		if (!(cp = *argp++) || *cp == '-')
 		    adios (NULL, "missing argument to %s", argp[-2]);
-		if (formsw)
-		    free (formsw);
+                mh_xfree(formsw);
 		formsw = getcpy (etcpath (cp));
 		continue;
 
@@ -371,7 +368,7 @@ do_cache:
     /*
      * Cache the current directory before we do any chdirs()'s.
      */
-    cwd = add(pwd(), NULL);
+    cwd = mh_xstrdup(pwd());
 
     if (!context_find ("path"))
 	free (path ("./", TFOLDER));
@@ -440,8 +437,7 @@ do_cache:
      * check if message is coming from file
      */
     if (file) {
-	if (!(cts = (CT *) mh_xcalloc ((size_t) 2, sizeof(*cts))))
-	    adios (NULL, "out of memory");
+	cts = mh_xcalloc(2, sizeof *cts);
 	ctp = cts;
 
 	if ((ct = parse_mime (file)))
@@ -473,8 +469,7 @@ do_cache:
 		done (1);
 	seq_setprev (mp);	/* set the previous-sequence */
 
-	if (!(cts = (CT *) mh_xcalloc ((size_t) (mp->numsel + 1), sizeof(*cts))))
-	    adios (NULL, "out of memory");
+	cts = mh_xcalloc(mp->numsel + 1, sizeof *cts);
 	ctp = cts;
 
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
@@ -554,7 +549,7 @@ do_cache:
      * Show the message content
      */
     if (showsw)
-	show_all_messages (cts, 0, 0, 0, NULL);
+	show_all_messages (cts, 0, 0, 0);
 
     /* Now free all the structures for the content */
     for (ctp = cts; *ctp; ctp++)