X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2d5d9e243c91784909b11948894e3ba0989107c0..d205d39a3f7207c9fefec53677226eb0ffad9966:/sbr/context_replace.c

diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index 0e9e1146..1027dcf6 100644
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -1,6 +1,4 @@
-
-/*
- * context_replace.c -- add/replace an entry in the context/profile list
+/* context_replace.c -- add/replace an entry in 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
@@ -14,7 +12,7 @@
 void
 context_replace (char *key, char *value)
 {
-    register struct node *np;
+    struct node *np;
 
     /*
      * If list is empty, allocate head of profile/context list.
@@ -35,13 +33,12 @@ context_replace (char *key, char *value)
      * this key, and replace its value if found.
      */
     for (np = m_defs;; np = np->n_next) {
-	if (!strcasecmp (np->n_name ? np->n_name : "", key ? key : "")) {
+	if (!strcasecmp (FENDNULL(np->n_name), FENDNULL(key))) {
 	    if (strcmp (value, np->n_field)) {
 		if (!np->n_context)
-		    admonish (NULL, "bug: context_replace(key=\"%s\",value=\"%s\")", key, value);
-		if (np->n_field)
-		    free (np->n_field);
-		np->n_field = getcpy (value);
+		    inform("bug: context_replace(key=\"%s\",value=\"%s\"), continuing...", key, value);
+                mh_xfree(np->n_field);
+		np->n_field = mh_xstrdup(value);
 		ctxflags |= CTXMOD;
 	    }
 	    return;