h/mh.h: Remove unused set_deleted() macro.

[nmh] / uip / rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index 30f94219ab7fba2a6144ebec7fdc8bb5f3976428..2d581a1c89640f48c045039a5d36608439c8e07f 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -133,7 +133,8 @@ rmf (char *folder)
     switch (i = chdir (maildir = m_maildir (folder))) {
        case OK: 
            if (access (".", W_OK) != NOTOK && access ("..", W_OK) != NOTOK)
-               break;          /* fall otherwise */
+               break;
+           /* FALLTHRU */
 
        case NOTOK: 
            snprintf (cur, sizeof(cur), "atr-%s-%s",
@@ -142,7 +143,7 @@ rmf (char *folder)
                printf ("[+%s de-referenced]\n", folder);
                return OK;
            }
-           advise (NULL, "you have no profile entry for the %s folder +%s",
+           inform("you have no profile entry for the %s folder +%s",
                    i == NOTOK ? "unreadable" : "read-only", folder);
            return NOTOK;
     }
@@ -162,7 +163,8 @@ rmf (char *folder)
            case '.': 
                if (strcmp (dp->d_name, ".") == 0
                        || strcmp (dp->d_name, "..") == 0)
-                   continue;   /* else fall */
+                   continue;
+               /* FALLTHRU */
 
            case ',': 
                break;
@@ -174,7 +176,7 @@ rmf (char *folder)
                        || has_prefix(dp->d_name, BACKUP_PREFIX))
                    break;
 
-               admonish (NULL, "file \"%s/%s\" not deleted",
+               inform("file \"%s/%s\" not deleted, continuing...",
                        folder, dp->d_name);
                others++;
                continue;
@@ -199,7 +201,7 @@ rmf (char *folder)
     if (others == 0 && remdir (maildir))
        return OK;
 
-    advise (NULL, "folder +%s not removed", folder);
+    inform("folder +%s not removed", folder);
     return NOTOK;
 }
 
@@ -229,7 +231,8 @@ rma (char *folder)
                && *(np->n_name + j) == '-'
                && strcmp (cp, np->n_name + j + 1) == 0) {
            if (!np->n_context)
-               admonish (NULL, "bug: context_del(key=\"%s\")", np->n_name);
+               inform("bug: context_del(key=\"%s\"), continuing...",
+                   np->n_name);
            if (pp) {
                pp->n_next = np->n_next;
                np = pp;