Removed version number from OpenBSD, it's in the "recent" section.

[nmh] / sbr / brkstring.c

diff --git a/sbr/brkstring.c b/sbr/brkstring.c
index bdc8c30ac91cea9b10f80ebfe01e95fd5290fa5e..8f1c297fab69ed4b28ee05b07fc4109f1afaf594 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
  *             -- an array of substrings
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the


@@ -8,8 +6,9 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "brkstring.h"
+#include "h/utils.h"

 
 /* allocate this number of pointers at a time */
 #define NUMBROKEN 256
 
 /* allocate this number of pointers at a time */
 #define NUMBROKEN 256


@@ -32,7 +31,7 @@ brkstring (char *str, char *brksep, char *brkterm)
     /* allocate initial space for pointers on first call */
     if (!broken) {
        len = NUMBROKEN;
     /* 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)));

     }
 
     /*
     }
 
     /*


@@ -81,12 +80,5 @@ brkstring (char *str, char *brksep, char *brkterm)
 static int
 brkany (char c, char *str)
 {
 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);

 }
 }