Removed defines for obsolete BSD bcopy functions; Use getc() directly.

[mmh] / sbr / brkstring.c

diff --git a/sbr/brkstring.c b/sbr/brkstring.c
index 1e78b17..4e71ab5 100644 (file)
--- a/sbr/brkstring.c
+++ b/sbr/brkstring.c
@@ -1,11 +1,11 @@
 /*
- * brkstring.c -- (destructively) split a string into
- *             -- an array of substrings
- *
- * This code is Copyright (c) 2002, by the authors of nmh.  See the
- * COPYRIGHT file in the root directory of the nmh distribution for
- * complete copyright information.
- */
+** brkstring.c -- (destructively) split a string into
+**             -- an array of substrings
+**
+** This code is Copyright (c) 2002, by the authors of nmh.  See the
+** COPYRIGHT file in the root directory of the nmh distribution for
+** complete copyright information.
+*/
 
 #include <h/mh.h>
 #include <h/utils.h>
@@ -17,13 +17,13 @@ static char **broken = NULL;    /* array of substring start addresses */
 static int len = 0;             /* current size of "broken"           */
 
 /*
- * static prototypes
- */
-static int brkany (char, char *);
+** static prototypes
+*/
+static int brkany(char, char *);
 
 
 char **
-brkstring (char *str, char *brksep, char *brkterm)
+brkstring(char *str, char *brksep, char *brkterm)
 {
        int i;
        char c, *s;
@@ -31,13 +31,13 @@ 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 = (char **) mh_xmalloc((size_t) (len * sizeof(*broken)));
        }
 
        /*
-        * scan string, replacing separators with zeroes
-        * and enter start addresses in "broken".
-        */
+       ** scan string, replacing separators with zeroes
+       ** and enter start addresses in "broken".
+       */
        s = str;
 
        for (i = 0;; i++) {
@@ -45,17 +45,17 @@ brkstring (char *str, char *brksep, char *brkterm)
        /* enlarge pointer array, if necessary */
        if (i >= len) {
                len += NUMBROKEN;
-               broken = mh_xrealloc (broken, (size_t) (len * sizeof(*broken)));
+               broken = mh_xrealloc(broken, (size_t) (len * sizeof(*broken)));
        }
 
-       while (brkany (c = *s, brksep))
+       while (brkany(c = *s, brksep))
                *s++ = '\0';
 
        /*
-        * we are either at the end of the string, or the
-        * terminator found has been found, so finish up.
-        */
-       if (!c || brkany (c, brkterm)) {
+       ** we are either at the end of the string, or the
+       ** terminator found has been found, so finish up.
+       */
+       if (!c || brkany(c, brkterm)) {
                *s = '\0';
                broken[i] = NULL;
                return broken;
@@ -64,7 +64,7 @@ brkstring (char *str, char *brksep, char *brkterm)
        /* set next start addr */
        broken[i] = s;
 
-       while ((c = *++s) && !brkany (c, brksep) && !brkany (c, brkterm))
+       while ((c = *++s) && !brkany(c, brksep) && !brkany(c, brkterm))
                ;    /* empty body */
        }
 
@@ -73,12 +73,12 @@ brkstring (char *str, char *brksep, char *brkterm)
 
 
 /*
- * If the character is in the string,
- * return 1, else return 0.
- */
+** If the character is in the string,
+** return 1, else return 0.
+*/
 
 static int
-brkany (char c, char *str)
+brkany(char c, char *str)
 {
        char *s;