X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffmt_compile.c;h=096f7dd62a46d1b31b696b0888ae14c8143a14ae;hb=d29d0d9cef0620e6a7ed0a18462d33c99ecd9da5;hp=9e08ab46e97a0f58359f367bb2d4c11b071ae5da;hpb=5ba9c2f13fedf1d8d6ed907ef1f505616290efaa;p=mmh

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index 9e08ab4..096f7dd 100644
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -39,6 +39,7 @@
 */
 
 #include <h/mh.h>
+#include <h/utils.h>
 #include <h/addrsbr.h>
 #include <h/tws.h>
 #include <h/fmt_scan.h>
@@ -208,7 +209,7 @@ static struct ftable functable[] = {
 
 /* Add new component to the hash table */
 #define NEWCOMP(cm,name) do { \
-		cm = ((struct comp *) calloc(1, sizeof (struct comp)));\
+		cm = ((struct comp *) mh_xcalloc(1, sizeof (struct comp)));\
 		cm->c_name = name;\
 		ncomp++;\
 		i = CHASH(name);\
@@ -327,7 +328,7 @@ fmt_compile(char *fstring, struct format **fmt)
 	i = strlen(fstring)/2 + 1;
 	if (i == 1)
 		i++;
-	next_fp = formatvec = (struct format *)calloc((size_t) i,
+	next_fp = formatvec = (struct format *)mh_xcalloc((size_t) i,
 		sizeof(struct format));
 	if (next_fp == NULL)
 		adios(EX_OSERR, NULL, "unable to allocate format storage");
@@ -480,7 +481,7 @@ do_name(char *sp, int preprocess)
 			CERROR("component used as both date and address");
 		}
 		cm->c_tws = (struct tws *)
-			calloc((size_t) 1, sizeof(*cm->c_tws));
+			mh_xcalloc((size_t) 1, sizeof(*cm->c_tws));
 		fp->f_type = preprocess;
 		PUTCOMP(sp);
 		cm->c_type |= CT_DATE;