Try to merge recent changes in v3.9 to image branch...

[libucw.git] / lib / mempool-str.c

diff --git a/lib/mempool-str.c b/lib/mempool-str.c
index 0da43e16c2fa16c9ab078b2337f7c8769b0b73a8..96bc07dadfeb91ea05a56dc7bf04e6b146b89fa9 100644 (file)
--- a/lib/mempool-str.c
+++ b/lib/mempool-str.c
@@ -22,6 +22,14 @@ mp_strdup(struct mempool *p, char *s)
   return t;
 }
 
+void *
+mp_memdup(struct mempool *p, void *s, uns len)
+{
+  void *t = mp_alloc_fast(p, len);
+  memcpy(t, s, len);
+  return t;
+}
+
 char *
 mp_multicat(struct mempool *p, ...)
 {
@@ -29,25 +37,27 @@ mp_multicat(struct mempool *p, ...)
   va_start(args, p);
   char *x, *y;
   uns cnt = 0;
-  a = args;
+  va_copy(a, args);
   while (x = va_arg(a, char *))
     cnt++;
   uns *sizes = alloca(cnt * sizeof(uns));
   uns len = 1;
   cnt = 0;
-  a = args;
+  va_end(a);
+  va_copy(a, args);
   while (x = va_arg(a, char *))
     len += sizes[cnt++] = strlen(x);
   char *buf = mp_alloc_fast_noalign(p, len);
   y = buf;
-  a = args;
+  va_end(a);
   cnt = 0;
-  while (x = va_arg(a, char *))
+  while (x = va_arg(args, char *))
     {
       memcpy(y, x, sizes[cnt]);
       y += sizes[cnt++];
     }
   *y = 0;
+  va_end(args);
   return buf;
 }