Add more NORETURN and CHECK_PRINTF function attributes.

[nmh] / uip / forw.c

diff --git a/uip/forw.c b/uip/forw.c
index 331be16bb9b2e0ac5324057e54964d142876305e..5e7db30bcc6cb9a3ddc2d8513602dc562014baa4 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -290,8 +290,7 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else {
            app_msgarg(&msgs, cp);
        }
@@ -454,9 +453,9 @@ try_it_again:
 
        if (digest) {
            snprintf (buf, sizeof(buf), IFORMAT, digest);
-           context_replace (buf, mh_xstrdup(m_name(issue)));
+           context_replace (buf, mh_xstrdup(m_str(issue)));
            snprintf (buf, sizeof(buf), VFORMAT, digest);
-           context_replace (buf, mh_xstrdup(m_name(volume)));
+           context_replace (buf, mh_xstrdup(m_str(volume)));
        }
 
        context_replace (pfolder, folder);      /* update current folder   */