Added mhshow-suffix-text entry.

[nmh] / sbr / context_replace.c

diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index 45d5a31d6563cf92c143572d39a401f9f1f39722..99f8ef3a512f644182e1337afe96826bea2a127e 100644 (file)
--- 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 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);