X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Fconcat.c;h=2d0bc603cdf7476b297a4f9f487cdbe82a7bb0c7;hb=18017df38ebb626f6eed6f339641fd1298c326e7;hp=a338835b3386abd3ba57263db47f0db593823406;hpb=6c42153ad9362cc676ea66563bf400d7511b3b68;p=mmh

diff --git a/sbr/concat.c b/sbr/concat.c
index a338835..2d0bc60 100644
--- a/sbr/concat.c
+++ b/sbr/concat.c
@@ -1,40 +1,37 @@
-
 /*
  * concat.c -- concatenate a variable number (minimum of 1)
  *             of strings in managed memory
  *
- * $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/utils.h>
 
 
 char *
 concat (char *s1, ...)
 {
-    char *cp, *dp, *sp;
-    size_t len;
-    va_list list;
+	char *cp, *dp, *sp;
+	size_t len;
+	va_list list;
 
-    len = strlen (s1) + 1;
-    va_start(list, s1); 
-    while ((cp = va_arg(list, char *)))
-	len += strlen (cp);
-    va_end(list);
+	len = strlen (s1) + 1;
+	va_start(list, s1);
+	while ((cp = va_arg(list, char *)))
+		len += strlen (cp);
+	va_end(list);
 
-    if (!(dp = sp = malloc(len)))
-	adios (NULL, "unable to allocate string storage");
+	dp = sp = mh_xmalloc(len);
 
-    sp = copy(s1, sp);
+	sp = copy(s1, sp);
 
-    va_start(list, s1); 
-    while ((cp = va_arg (list, char *)))
-	sp = copy(cp, sp);
-    va_end(list);
+	va_start(list, s1);
+	while ((cp = va_arg (list, char *)))
+		sp = copy(cp, sp);
+	va_end(list);
 
-    return dp;
+	return dp;
 }