X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0e7106da702d97e10f3bd24d8284a2ab86044ebd..94187a80bd60baab4b9c4b949ad820d730578123:/sbr/context_foil.c

diff --git a/sbr/context_foil.c b/sbr/context_foil.c
index d6c90c48..09bfe30c 100644
--- 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,13 +16,13 @@
 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:
      *  1 sbr/context_read.c uses it only after setting it itself
      *  2 uip/install_mh.c uses it only after setting it itself
-     *  3 uip/mshcmds.c and uip/mark.c print it if given the -debug switch
+     *  3 uip/mark.c prints it if given the -debug switch
      * A worthwhile piece of code cleanup would be to make 1 and
      * 2 use a local variable and just delete 3.
      *
@@ -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;
 }
-