X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d66378909931a74ed83e29d592982eaa3e7e0107..cf57870921b26703aad420c6741c524b33736ff1:/sbr/context_replace.c

diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index bceb9dfd..99f8ef3a 100644
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -14,15 +14,14 @@
 void
 context_replace (char *key, char *value)
 {
-    register struct node *np;
+    struct node *np;
 
     /*
-     * If list is emtpy, allocate head of profile/context list.
+     * If list is empty, allocate head of profile/context list.
      */
     if (!m_defs) {
-	m_defs = (struct node *) mh_xmalloc (sizeof(*np));
-
-	np = m_defs;
+	NEW(np);
+        m_defs = np;
 	np->n_name = getcpy (key);
 	np->n_field = getcpy (value);
 	np->n_context = 1;
@@ -40,9 +39,8 @@ context_replace (char *key, char *value)
 	    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);
+                mh_xfree(np->n_field);
+		np->n_field = mh_xstrdup(value);
 		ctxflags |= CTXMOD;
 	    }
 	    return;
@@ -54,8 +52,7 @@ context_replace (char *key, char *value)
     /*
      * Else add this new entry at the end
      */
-    np->n_next = (struct node *) mh_xmalloc (sizeof(*np));
-
+    NEW(np->n_next);
     np = np->n_next;
     np->n_name = getcpy (key);
     np->n_field = getcpy (value);