uip/mhparse.c: Fix body starting a byte too soon when no blank line.

[nmh] / sbr / context_del.c

diff --git a/sbr/context_del.c b/sbr/context_del.c
index e6cdc73dddd6a0090cf757a4f972754054660522..efe5e41051ebea4573b2fe0da0a2de7633594d10 100644 (file)
--- a/sbr/context_del.c
+++ b/sbr/context_del.c
@@ -1,6 +1,4 @@
-
-/*
- * 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
@@ -8,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 /*
  * Delete a key/value pair from the context/profile list.
@@ -17,20 +16,19 @@
 int
 context_del (char *key)
 {
-    register struct node *np, *pp;
+    struct node *np, *pp;
 
     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), FENDNULL(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);
-           if (np->n_field)
-               free (np->n_field);
-           free ((char *) np);
+            mh_xfree(np->n_field);
+           free(np);
            ctxflags |= CTXMOD;
            return 0;
        }