Removed void casts for ignored return values of function calls.
[mmh] / uip / burst.c
index 374eff5..fc2f711 100644 (file)
@@ -56,7 +56,7 @@ main(int argc, char **argv)
 #ifdef LOCALE
        setlocale(LC_ALL, "");
 #endif
-       invo_name = r1bindex(argv[0], '/');
+       invo_name = mhbasename(argv[0]);
 
        /* read user profile/context */
        context_read();
@@ -107,19 +107,17 @@ main(int argc, char **argv)
                        if (folder)
                                adios(NULL, "only one folder at a time!");
                        else
-                               folder = pluspath(cp);
+                               folder = getcpy(expandfol(cp));
                } else {
                        msgs[msgp++] = cp;
                }
        }
 
-       if (!context_find("path"))
-               free(path("./", TFOLDER));
        if (!msgp)
                msgs[msgp++] = "cur";
        if (!folder)
-               folder = getfolder(1);
-       maildir = m_maildir(folder);
+               folder = getcurfol();
+       maildir = toabsdir(folder);
 
        if (chdir(maildir) == NOTOK)
                adios(maildir, "unable to change directory to");
@@ -164,7 +162,7 @@ main(int argc, char **argv)
        }
 
        free((char *) smsgs);
-       context_replace(pfolder, folder);  /* update current folder */
+       context_replace(curfolder, folder);  /* update current folder */
 
        /*
        ** If -inplace is given, then the first message burst becomes
@@ -365,13 +363,13 @@ burst(struct msgs **mpp, int msgnum, struct smsg *smsgs, int numburst,
                        if (rename(f1, f3) == NOTOK)
                                admonish(f3, "unable to rename %s to", f1);
 
-                       (void)snprintf(f3, sizeof (f3), "%s/%d", maildir, i);
+                       snprintf(f3, sizeof (f3), "%s/%d", maildir, i);
                        ext_hook("del-hook", f3, (char *)0);
                }
                if (rename(f2, f1) == NOTOK)
                        admonish(f1, "unable to rename %s to", f2);
 
-               (void)snprintf(f3, sizeof (f3), "%s/%d", maildir, i);
+               snprintf(f3, sizeof (f3), "%s/%d", maildir, i);
                ext_hook("add-hook", f3, (char *)0);
 
                copy_msg_flags(mp, i, msgnum);