print_sw.c: Move interface to own file.

[nmh] / sbr / context_del.c

diff --git a/sbr/context_del.c b/sbr/context_del.c
index 4b4e285e7e3be8eb6f9aa21b9c051125a35b859c..bd7ae70d3722374e6f5270ad6163a607b93860c7 100644 (file)
--- a/sbr/context_del.c
+++ b/sbr/context_del.c
@@ -1,14 +1,13 @@
-
-/*
- * context_del.c -- delete an entry from the context/profile list
+/* context_del.c -- delete an entry from the context/profile list
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "error.h"
+#include "h/utils.h"
 
 /*
  * Delete a key/value pair from the context/profile list.
@@ -20,17 +19,18 @@ context_del (char *key)
 {
     struct node *np, *pp;
 
+    key = FENDNULL(key);
     for (np = m_defs, pp = NULL; np; pp = np, np = np->n_next) {
-       if (!strcasecmp (np->n_name ? np->n_name : "", key ? key : "")) {
+       if (!strcasecmp(FENDNULL(np->n_name), key)) {
            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;
            else
                m_defs = np->n_next;
            free (np->n_name);
-            mh_xfree(np->n_field);
-           free ((char *) np);
+            free(np->n_field);
+           free(np);
            ctxflags |= CTXMOD;
            return 0;
        }