X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c6f2d14d9c38345075629af3487c2de491584ca1..cfb444d37fc236a9fdac369cbcf2a5bfc37a33f5:/sbr/context_del.c?ds=sidebyside

diff --git a/sbr/context_del.c b/sbr/context_del.c
index 5889a17f..efe5e410 100644
--- 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.
@@ -20,17 +19,16 @@ context_del (char *key)
     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;
 	}