inc/test-eom-align: Create test mboxes in less steps.

[nmh] / sbr / context_find.c

diff --git a/sbr/context_find.c b/sbr/context_find.c
index 0d3f11a27a0cc219caecf0a7d6e48e00cb289488..f4fe7ed1303035120e68ff9b3d7d8032e2b81edf 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
@@ -15,9 +13,10 @@ context_find (const char *str)
 {
     struct node *np;
 
+    str = FENDNULL(str);
     for (np = m_defs; np; np = np->n_next)
-       if (!strcasecmp (np->n_name ? np->n_name : "", str ? str : ""))
-           return (np->n_field);
+       if (!strcasecmp(FENDNULL(np->n_name), str))
+           return np->n_field;
 
     return NULL;
 }
@@ -61,9 +60,11 @@ context_find_by_type (const char *string, const char *type,
 int
 context_find_prefix (const char *prefix) {
     struct node *np;
+    size_t len;
 
+    len = strlen(prefix);
     for (np = m_defs; np; np = np->n_next) {
-       if (np->n_name  &&  ! strncasecmp (np->n_name, prefix, strlen(prefix))) {
+       if (np->n_name  &&  ! strncasecmp (np->n_name, prefix, len)) {
            return 1;
         }
     }