X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fcontext_replace.c;h=4416eee4932fb10f184280e5b58564ae1b88f745;hp=541253db66309398b6591db84ebe7124ad184fc2;hb=0aef47ae5c03e1d9e3f225efe5ae362e7cf5ee35;hpb=6c42153ad9362cc676ea66563bf400d7511b3b68

diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index 541253d..4416eee 100644
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -10,6 +10,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 
 void
@@ -17,16 +18,11 @@ context_replace (char *key, char *value)
 {
     register struct node *np;
 
-    /* sanity check - check that context has been read */
-    if (defpath == NULL)
-	adios (NULL, "oops, context hasn't been read yet");
-
     /*
      * If list is emtpy, allocate head of profile/context list.
      */
     if (!m_defs) {
-	if (!(m_defs = (struct node *) malloc (sizeof(*np))))
-	    adios (NULL, "unable to allocate profile storage");
+	m_defs = (struct node *) mh_xmalloc (sizeof(*np));
 
 	np = m_defs;
 	np->n_name = getcpy (key);
@@ -42,7 +38,7 @@ context_replace (char *key, char *value)
      * this key, and replace its value if found.
      */
     for (np = m_defs;; np = np->n_next) {
-	if (!strcasecmp (np->n_name, key)) {
+	if (!mh_strcasecmp (np->n_name, key)) {
 	    if (strcmp (value, np->n_field)) {
 		if (!np->n_context)
 		    admonish (NULL, "bug: context_replace(key=\"%s\",value=\"%s\")", key, value);
@@ -60,9 +56,7 @@ context_replace (char *key, char *value)
     /*
      * 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");
+    np->n_next = (struct node *) mh_xmalloc (sizeof(*np));
 
     np = np->n_next;
     np->n_name = getcpy (key);