uip/popsbr.c: Delete unused pop_list(), etc.

[nmh] / sbr / context_foil.c

diff --git a/sbr/context_foil.c b/sbr/context_foil.c
index d6c90c48b3ba89814ef22f217f2d9d74997b288e..478d941b083795d1793b54e89dc3054b861d8dad 100644 (file)
--- a/sbr/context_foil.c
+++ b/sbr/context_foil.c
@@ -1,8 +1,4 @@
-
-/*
- * context_foil.c -- foil search of profile and context
- *
- * $Id$
+/* context_foil.c -- foil search of profile and context
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -10,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 /*
  * Foil search of users .mh_profile
@@ -19,7 +16,7 @@
 int
 context_foil (char *path)
 {
-    register struct node *np;
+    struct node *np;
 
     /* In fact, nobody examines defpath in code paths where
      * it's been set by us -- the uses in the source tree are:
@@ -45,18 +42,14 @@ context_foil (char *path)
      * If path is given, create a minimal profile/context list
      */
     if (path) {
-       if (!(m_defs = (struct node *) malloc (sizeof(*np)))) {
-           advise (NULL, "unable to allocate profile storage");
-           return -1;
-       }
-
-       np = m_defs;
+       NEW(np);
+       m_defs = np;
        if (!(np->n_name = strdup ("Path"))) {
-           advise (NULL, "strdup failed");
+           inform("strdup failed");
            return -1;
        }
        if (!(np->n_field = strdup (path))) {
-           advise (NULL, "strdup failed");
+           inform("strdup failed");
            return -1;
        }
        np->n_context = 0;
@@ -64,11 +57,10 @@ context_foil (char *path)
 
        if (mypath == NULL && (mypath = getenv ("HOME")) != NULL)
            if (!(mypath = strdup (mypath))) {
-               advise (NULL, "strdup failed");
+               inform("strdup failed");
                return -1;
            }
     }
 
     return 0;
 }
-