Fix uip/whom.c for C89 compatibility
[mmh] / sbr / brkstring.c
index 32dd37f..a9446fe 100644 (file)
@@ -7,6 +7,7 @@
 ** complete copyright information.
 */
 
+#include <sysexits.h>
 #include <h/mh.h>
 #include <h/utils.h>
 
@@ -29,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_xcalloc(len, sizeof(*broken));
        }
 
        /*
@@ -41,8 +42,7 @@ 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, len * sizeof(*broken));
                }
 
                /* handle separators */
@@ -71,5 +71,5 @@ brkstring(char *str, char *brksep, char *brkterm)
                        }
                }
        }
-       adios("brkstring()", "reached unreachable point");
+       adios(EX_SOFTWARE, "brkstring()", "reached unreachable point");
 }