Print pointers in debug with C99's `%p' rather than `0x%x'.

[nmh] / sbr / context_find.c

diff --git a/sbr/context_find.c b/sbr/context_find.c
index 5cad0164144ac8b9497609d715a6466758cde790..4d89fbc5fe5013b46db3bdca5f71d93b56da5810 100644 (file)
--- a/sbr/context_find.c
+++ b/sbr/context_find.c
@@ -1,6 +1,4 @@
-
-/*
- * context_find.c -- find an entry in the context/profile list
+/* context_find.c -- find an entry in 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
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -16,7 +14,7 @@ context_find (const char *str)
     struct node *np;
 
     for (np = m_defs; np; np = np->n_next)
     struct node *np;
 
     for (np = m_defs; np; np = np->n_next)

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

            return (np->n_field);
 
     return NULL;
            return (np->n_field);
 
     return NULL;


@@ -25,8 +23,9 @@ context_find (const char *str)
 
 /*
  * Helper function to search first, if subtype is non-NULL, for
 
 /*
  * Helper function to search first, if subtype is non-NULL, for

- * invoname-string-type/subtype and then invoname-string-type.
- * If entry is found but is empty, returns NULL.
+ * invoname-string-type/subtype and then, if not yet found,
+ * invoname-string-type.  If entry is found but is empty, it is
+ * treated as not found.

  */
 char *
 context_find_by_type (const char *string, const char *type,
  */
 char *
 context_find_by_type (const char *string, const char *type,


@@ -51,3 +50,21 @@ context_find_by_type (const char *string, const char *type,
 
     return value;
 }
 
     return value;
 }

+
+
+/*
+ * Helper function to search profile an entry with name beginning with prefix.
+ * The search is case insensitive.
+ */
+int
+context_find_prefix (const char *prefix) {
+    struct node *np;
+
+    for (np = m_defs; np; np = np->n_next) {
+       if (np->n_name  &&  ! strncasecmp (np->n_name, prefix, strlen(prefix))) {
+           return 1;
+        }
+    }
+
+    return 0;
+}