Rewrite getcpy() using mh_x*() allocation functions.

[nmh] / sbr / context_replace.c

diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index b723cb43118a65bf5f0c820b1739a9b8cf307ed7..0e9e11467d10d007a3ab13a078b5939f3e0d7370 100644 (file)
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -2,14 +2,13 @@
 /*
  * context_replace.c -- add/replace an entry in the context/profile list
  *
 /*
  * context_replace.c -- add/replace an entry in the context/profile list
  *

- * $Id$
- *

  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 
 #include <h/mh.h>
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 
 #include <h/mh.h>

+#include <h/utils.h>

 
 
 void
 
 
 void


@@ -18,13 +17,11 @@ context_replace (char *key, char *value)
     register struct node *np;
 
     /*
     register 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) {
      */
     if (!m_defs) {

-       if (!(m_defs = (struct node *) malloc (sizeof(*np))))
-           adios (NULL, "unable to allocate profile storage");
-
-       np = m_defs;
+       NEW(np);
+        m_defs = np;

        np->n_name = getcpy (key);
        np->n_field = getcpy (value);
        np->n_context = 1;
        np->n_name = getcpy (key);
        np->n_field = getcpy (value);
        np->n_context = 1;


@@ -38,7 +35,7 @@ context_replace (char *key, char *value)
      * this key, and replace its value if found.
      */
     for (np = m_defs;; np = np->n_next) {
      * this key, and replace its value if found.
      */
     for (np = m_defs;; np = np->n_next) {

-       if (!strcasecmp (np->n_name, key)) {
+       if (!strcasecmp (np->n_name ? np->n_name : "", key ? key : "")) {

            if (strcmp (value, np->n_field)) {
                if (!np->n_context)
                    admonish (NULL, "bug: context_replace(key=\"%s\",value=\"%s\")", key, value);
            if (strcmp (value, np->n_field)) {
                if (!np->n_context)
                    admonish (NULL, "bug: context_replace(key=\"%s\",value=\"%s\")", key, value);


@@ -56,10 +53,7 @@ context_replace (char *key, char *value)
     /*
      * Else add this new entry at the end
      */
     /*
      * Else add this new entry at the end
      */

-    np->n_next = (struct node *) malloc (sizeof(*np));
-    if (!np->n_next)
-       adios (NULL, "unable to allocate profile storage");
-
+    NEW(np->n_next);

     np = np->n_next;
     np->n_name = getcpy (key);
     np->n_field = getcpy (value);
     np = np->n_next;
     np->n_name = getcpy (key);
     np->n_field = getcpy (value);