projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed a few #ifndef JLR/#endif pairs because they're not needed.
[mmh]
/
sbr
/
brkstring.c
diff --git
a/sbr/brkstring.c
b/sbr/brkstring.c
index
715aaf5
..
5375596
100644
(file)
--- a/
sbr/brkstring.c
+++ b/
sbr/brkstring.c
@@
-3,10
+3,13
@@
* brkstring.c -- (destructively) split a string into
* -- an array of substrings
*
* brkstring.c -- (destructively) split a string into
* -- 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
+32,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
+46,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))