Add die(fmt, ...). Equivalent to adios(NULL, fmt, ...).

[nmh] / uip / mhlsbr.c

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 00e1ef265d8b175331028b5fe16a664fdc600c38..e7651f584992a21ba81bbbf9290314b3030ce0e8 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -327,7 +327,7 @@ static void putch (char, unsigned long);
 static void intrser (int);
 static void pipeser (int);
 static void quitser (int);
-static void mhladios (char *, char *, ...);
+static void mhladios (char *, char *, ...) CHECK_PRINTF(2, 3);
 static void mhldone (int);
 static void filterbody (struct mcomp *, char *, int, int,
                         m_getfld_state_t);
@@ -666,9 +666,8 @@ mhl_format (char *file, int length, int width)
 
            fprintf (stderr, "c1: name=\"%s\" text=\"%s\" ovtxt=\"%s\"\n",
                    c1->c_name, c1->c_text, c1->c_ovtxt);
-           fprintf (stderr, "\tnfs=0x%x fmt=0x%x\n",
-                    (unsigned int)(unsigned long) c1->c_nfs,
-                    (unsigned int)(unsigned long) c1->c_fmt);
+           fprintf(stderr, "\tnfs=%p fmt=%p\n",
+                (void *)c1->c_nfs, (void *)c1->c_fmt);
            fprintf (stderr, "\toffset=%d ovoff=%d width=%d cwidth=%d length=%d\n",
                    c1->c_offset, c1->c_ovoff, c1->c_width,
                    c1->c_cwidth, c1->c_length);
@@ -948,7 +947,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
                printf (" Forwarded Message%s", PLURALS(ofilec));
            else
                printf (" Message %d", ofilen);
-           printf ("\n\n");
+           puts("\n");
        }
     } else {
        switch (ontty) {
@@ -958,7 +957,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
                        if ((global.c_flags & CLEARSCR))
                            nmh_clear_screen ();
                        else
-                           printf ("\n\n\n");
+                            puts("\n\n");
                    }
                    printf (">>> %s\n\n", mname);
                }
@@ -969,7 +968,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
                if (ofilec > 1) {
                    if (SOprintf ("Press <return> to list \"%s\"...", mname)) {
                        if (ofilen > 1)
-                           printf ("\n\n\n");
+                           puts("\n\n");
                        printf ("Press <return> to list \"%s\"...", mname);
                    }
                    fflush (stdout);
@@ -989,7 +988,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
            default: 
                if (ofilec > 1) {
                    if (ofilen > 1) {
-                       printf ("\n\n\n");
+                       puts("\n\n");
                        if (clearflg > 0)
                            nmh_clear_screen ();
                    }
@@ -1306,7 +1305,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
     if ((ovtxt = c1->c_ovtxt ? c1->c_ovtxt : global.c_ovtxt) == NULL)
        ovtxt = "";
     if (wid < ovoff + strlen (ovtxt) + 5)
-       mhladios (NULL, "component: %s width(%d) too small for overflow(%d)",
+       mhladios(NULL, "component: %s width(%d) too small for overflow(%zu)",
                c1->c_name, wid, ovoff + strlen (ovtxt) + 5);
     onelp = NULL;