sbr/utils.c: Delete dead-code open_form(); not called.

[nmh] / sbr / brkstring.c

diff --git a/sbr/brkstring.c b/sbr/brkstring.c
index 715aaf5e2b65a3bc394804861c9354e75c94ff68..8b577dbed6ba06561910029d1c26d7f3ffc10442 100644 (file)
--- a/sbr/brkstring.c
+++ b/sbr/brkstring.c
@@ -1,12 +1,13 @@
-
-/*
- * brkstring.c -- (destructively) split a string into
+/* brkstring.c -- (destructively) split a string into

  *             -- an array of substrings
  *
  *             -- an array of substrings
  *

- * $Id$
+ * 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/mh.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


@@ -29,8 +30,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;

-       if (!(broken = (char **) malloc ((size_t) (len * sizeof(*broken)))))
-           adios (NULL, "unable to malloc array in brkstring");
+       broken = (char **) mh_xmalloc ((size_t) (len * sizeof(*broken)));

     }
 
     /*
     }
 
     /*


@@ -44,8 +44,7 @@ brkstring (char *str, char *brksep, char *brkterm)
        /* enlarge pointer array, if necessary */
        if (i >= len) {
            len += NUMBROKEN;
        /* enlarge pointer array, if necessary */
        if (i >= len) {
            len += NUMBROKEN;

-           if (!(broken = realloc (broken, (size_t) (len * sizeof(*broken)))))
-               adios (NULL, "unable to realloc array in brkstring");
+           broken = mh_xrealloc (broken, (size_t) (len * sizeof(*broken)));

        }
 
        while (brkany (c = *s, brksep))
        }
 
        while (brkany (c = *s, brksep))


@@ -58,7 +57,7 @@ brkstring (char *str, char *brksep, char *brkterm)
        if (!c || brkany (c, brkterm)) {
            *s = '\0';
            broken[i] = NULL;
        if (!c || brkany (c, brkterm)) {
            *s = '\0';
            broken[i] = NULL;

-           return broken;
+           break;

        }
 
        /* set next start addr */
        }
 
        /* set next start addr */


@@ -68,7 +67,7 @@ brkstring (char *str, char *brksep, char *brkterm)
            ;   /* empty body */
     }
 
            ;   /* empty body */
     }
 

-    return broken;     /* NOT REACHED */
+    return broken;

 }
 
 
 }