scansbr.c: Move interface to own file.

[nmh] / sbr / context_del.c

diff --git a/sbr/context_del.c b/sbr/context_del.c
index d08e717fe9bb8a4d22acdb31cc4f14df5b389c54..b0caa5cab8d758f705fb5a31411965775e092956 100644 (file)
--- a/sbr/context_del.c
+++ b/sbr/context_del.c
@@ -1,13 +1,14 @@
-/*
- * context_del.c -- delete an entry from the context/profile list
+/* context_del.c -- delete an entry from the context/profile list

  *
  * 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.
  */
 
  *
  * 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>
+#include "h/mh.h"
+#include "context_del.h"
+#include "error.h"
+#include "h/utils.h"

 
 /*
  * Delete a key/value pair from the context/profile list.
 
 /*
  * Delete a key/value pair from the context/profile list.


@@ -19,8 +20,9 @@ context_del (char *key)
 {
     struct node *np, *pp;
 
 {
     struct node *np, *pp;
 

+    key = FENDNULL(key);

     for (np = m_defs, pp = NULL; np; pp = np, np = np->n_next) {
     for (np = m_defs, pp = NULL; np; pp = np, np = np->n_next) {

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

            if (!np->n_context)
                inform("bug: context_del(key=\"%s\"), continuing...", np->n_name);
            if (pp)
            if (!np->n_context)
                inform("bug: context_del(key=\"%s\"), continuing...", np->n_name);
            if (pp)


@@ -28,7 +30,7 @@ context_del (char *key)
            else
                m_defs = np->n_next;
            free (np->n_name);
            else
                m_defs = np->n_next;
            free (np->n_name);

-            mh_xfree(np->n_field);
+            free(np->n_field);

            free(np);
            ctxflags |= CTXMOD;
            return 0;
            free(np);
            ctxflags |= CTXMOD;
            return 0;