get_file_info(): Flip logic throughout, reducing nesting.

[nmh] / sbr / brkstring.c

diff --git a/sbr/brkstring.c b/sbr/brkstring.c
index 5375596de68b49e817ae406f809423f61607f385..f0f43693695c26287ad9817c98027a00b035de56 100644 (file)
--- a/sbr/brkstring.c
+++ b/sbr/brkstring.c
@@ -1,6 +1,4 @@
-
-/*
- * brkstring.c -- (destructively) split a string into
+/* brkstring.c -- (destructively) split a string into
  *             -- an array of substrings
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
@@ -59,7 +57,7 @@ brkstring (char *str, char *brksep, char *brkterm)
        if (!c || brkany (c, brkterm)) {
            *s = '\0';
            broken[i] = NULL;
-           return broken;
+           break;
        }
 
        /* set next start addr */
@@ -69,7 +67,7 @@ brkstring (char *str, char *brksep, char *brkterm)
            ;   /* empty body */
     }
 
-    return broken;     /* NOT REACHED */
+    return broken;
 }
 
 
@@ -81,12 +79,5 @@ brkstring (char *str, char *brksep, char *brkterm)
 static int
 brkany (char c, char *str)
 {
-    char *s;
-
-    if (str) {
-       for (s = str; *s; s++)
-           if (c == *s)
-               return 1;
-    }
-    return 0;
+    return str && c && strchr(str, c);
 }