From: Ken Hornstein <kenh@pobox.com>
Date: Wed, 9 Apr 2014 17:15:28 +0000 (-0400)
Subject: Change things so we only supply a form filename; most programs don't do
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/d7e260c9a302e465a2c40e75ff8bd506768a7dbf?ds=sidebyside;hp=f62ff135add5529166b3cbd8ab9347f0db7048bb

Change things so we only supply a form filename; most programs don't do
both, and this isn't work the extra hassle.
---

diff --git a/h/mhparse.h b/h/mhparse.h
index 3685dd9e..d165a63b 100644
--- a/h/mhparse.h
+++ b/h/mhparse.h
@@ -495,11 +495,10 @@ char *get_param_value(PM pm, char replace);
  * inlineonly	- If true, only display MIME parts that are marked with
  *		  a disposition of "inline" (includes parts that lack a
  *		  Content-Disposition header).
- * markerform	- A file of mh-format(5) code used to display info about
- *		  MIME parts.
- * markerformat - mh-format(5) code used to display info about MIME parts.
+ * markerform	- The name of a file containg mh-format(5) code used to
+ *		  display markers about non-displayed MIME parts.
  */
 void show_all_messages(CT *cts, int concat, int textonly, int inlineonly,
-		       char *markerform, char *markerformat);
+		       char *markerform);
 
 extern int checksw;	/* Add Content-MD5 field */
diff --git a/uip/mhn.c b/uip/mhn.c
index 28f499bb..a2733ad2 100644
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -552,7 +552,7 @@ do_cache:
      * Show the message content
      */
     if (showsw)
-	show_all_messages (cts, 0, 0, 0, NULL, NULL);
+	show_all_messages (cts, 0, 0, 0, NULL);
 
     /* Now free all the structures for the content */
     for (ctp = cts; *ctp; ctp++)
diff --git a/uip/mhshow.c b/uip/mhshow.c
index 97048b08..9fb18e7b 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -388,7 +388,7 @@ do_cache:
     /*
      * Show the message content
      */
-    show_all_messages (cts, concatsw, textonly, inlineonly, NULL, NULL);
+    show_all_messages (cts, concatsw, textonly, inlineonly, NULL);
 
     /* Now free all the structures for the content */
     for (ctp = cts; *ctp; ctp++)
diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 72ef1584..84c79f46 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -62,7 +62,7 @@ static int show_external (CT, int, int, int, int, struct format *);
 static int parse_display_string (CT, char *, int *, int *, char *, char *,
 				 size_t, int multipart);
 static int convert_content_charset (CT, char **);
-static struct format *compile_marker(char *, char *);
+static struct format *compile_marker(char *);
 static void output_marker (CT, struct format *);
 static void free_markercomps (void);
 static int pidcheck(int);
@@ -93,7 +93,7 @@ static struct param_comp_list *dispo_pc_list = NULL;
 
 void
 show_all_messages (CT *cts, int concat, int textonly, int inlineonly,
-		   char *markerform, char *markerformat)
+		   char *markerform)
 {
     CT ct, *ctp;
     struct format *fmt;
@@ -108,7 +108,7 @@ show_all_messages (CT *cts, int concat, int textonly, int inlineonly,
     /*
      * Compile the content marker format line
      */
-    fmt = compile_marker(markerform, markerformat);
+    fmt = compile_marker(markerform);
 
     /*
      * If form is "mhl.null", suppress display of header.
@@ -1207,7 +1207,7 @@ convert_content_charset (CT ct, char **file) {
 		       "%|%{ctype-name}%> ]"
 
 static struct format *
-compile_marker(char *markerform, char *markerformat)
+compile_marker(char *markerform)
 {
     struct format *fmt;
     char *fmtstring;
@@ -1215,7 +1215,7 @@ compile_marker(char *markerform, char *markerformat)
     unsigned int bucket;
     struct param_comp_list *pc_entry;
 
-    fmtstring = new_fs(markerform, markerformat, DEFAULT_MARKER);
+    fmtstring = new_fs(markerform, NULL, DEFAULT_MARKER);
 
     (void) fmt_compile(fmtstring, &fmt, 1);
     free(fmtstring);