X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/93a18dd7a6b92922361383a4e6152380da5f3583..b3d4a4452c332fc3550db3fbdf9e02027b41e985:/uip/mhmisc.c?ds=inline

diff --git a/uip/mhmisc.c b/uip/mhmisc.c
index a20c186e..24fb9b2c 100644
--- a/uip/mhmisc.c
+++ b/uip/mhmisc.c
@@ -5,11 +5,13 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/mime.h>
-#include <h/mhparse.h>
-#include <h/utils.h>
-#include "../sbr/makedir.h"
+#include "h/mh.h"
+#include "sbr/error.h"
+#include "h/mime.h"
+#include "h/mhparse.h"
+#include "h/utils.h"
+#include "sbr/makedir.h"
+#include "mhmisc.h"
 
 extern int debugsw;
 
@@ -21,21 +23,11 @@ int ntype = 0;
 char *parts[NPARTS + 1];
 char *types[NTYPES + 1];
 
-int userrs = 0;
+bool userrs;
 
 static char *errs = NULL;
 
 
-/*
- * prototypes
- */
-int part_ok (CT) PURE;
-int part_exact(CT ct) PURE;
-int type_ok (CT, int);
-void content_error (char *, CT, char *, ...) CHECK_PRINTF(3, 4);
-void flush_errors (void);
-
-
 int
 part_ok (CT ct)
 {
@@ -103,7 +95,7 @@ type_ok (CT ct, int sP)
 
 
 /*
- * Returns true if this content is marked as "inline".
+ * Returns true if the content has a disposition of "inline".
  *
  * Technically we should check parent content to see if they have
  * disposition to use as a default, but we don't right now.  Maybe
@@ -170,7 +162,7 @@ void
 content_error (char *what, CT ct, char *fmt, ...)
 {
     va_list arglist;
-    int	i, len, buflen;
+    int	len, buflen;
     char *bp, buffer[BUFSIZ];
     CI ci;
 
@@ -213,10 +205,8 @@ content_error (char *what, CT ct, char *fmt, ...)
 	buflen -= len;
     }
 
-    i = strlen (invo_name) + 2;
-
     /* Now add content type and subtype */
-    snprintf (bp, buflen, "\n%*s(content %s/%s", i, "",
+    snprintf (bp, buflen, "\n    (content %s/%s",
 	ci->ci_type, ci->ci_subtype);
     len = strlen (bp);
     bp += len;
@@ -251,6 +241,8 @@ content_error (char *what, CT ct, char *fmt, ...)
     } else {
 	inform("%s", buffer);
     }
+
+    va_end(arglist);
 }