Removed void casts for ignored return values of function calls.

[mmh] / uip / rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index 7d81a39..10a4a10 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -92,9 +92,10 @@ main(int argc, char **argv)
                interactive = defolder;
 
        if (strchr(folder, '/') && (*folder != '/') && (*folder != '.')) {
-               for (cp = copy(folder, newfolder);
-                               cp > newfolder && *cp != '/'; cp--)
-                       continue;
+               strcpy(newfolder, folder);
+               cp = newfolder + strlen(newfolder);
+               while (cp > newfolder && *cp != '/')
+                       cp--;
                if (cp > newfolder)
                        *cp = '\0';
                else
@@ -111,11 +112,11 @@ main(int argc, char **argv)
        }
 
        if (rmf(folder) == OK) {
-               char *cfolder = context_find(pfolder);
+               char *cfolder = context_find(curfolder);
                if (cfolder && strcmp(cfolder, newfolder)) {
                        printf("[+%s now current]\n", newfolder);
                        /* update current folder */
-                       context_replace(pfolder, newfolder);
+                       context_replace(curfolder, newfolder);
                }
        }
        context_save();  /* save the context file */
@@ -157,7 +158,7 @@ rmf(char *folder)
        ** Run the external delete hook program.
        */
 
-       (void)ext_hook("del-hook", maildir, (char *)0);
+       ext_hook("del-hook", maildir, (char *)0);
 
        j = strlen(backup_prefix);
        while ((dp = readdir(dd))) {