X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5dd6771b28c257af405d7248639ed0e3bcdce38b..94187a80bd60baab4b9c4b949ad820d730578123:/sbr/brkstring.c

diff --git a/sbr/brkstring.c b/sbr/brkstring.c
index 5375596d..0f7c17fc 100644
--- 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
@@ -32,7 +30,7 @@ brkstring (char *str, char *brksep, char *brkterm)
     /* allocate initial space for pointers on first call */
     if (!broken) {
 	len = NUMBROKEN;
-	broken = (char **) mh_xmalloc ((size_t) (len * sizeof(*broken)));
+	broken = mh_xmalloc ((size_t) (len * sizeof(*broken)));
     }
 
     /*
@@ -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);
 }