X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Fmempool-str.c;h=1072e3dacb7fde29a0deceef692d77732478b6fa;hb=b8667492cf36a609939ee35ac42900ff0b0cc80f;hp=26a8b3bc7416e28f4f01f122e101a870a2cd7b81;hpb=6912c77a66798de162fe31f79581cd7b5c97f12c;p=libucw.git

diff --git a/ucw/mempool-str.c b/ucw/mempool-str.c
index 26a8b3bc..1072e3da 100644
--- a/ucw/mempool-str.c
+++ b/ucw/mempool-str.c
@@ -18,14 +18,14 @@ mp_strdup(struct mempool *p, const char *s)
 {
   if (!s)
     return NULL;
-  uint l = strlen(s) + 1;
+  size_t l = strlen(s) + 1;
   char *t = mp_alloc_fast_noalign(p, l);
   memcpy(t, s, l);
   return t;
 }
 
 void *
-mp_memdup(struct mempool *p, const void *s, uint len)
+mp_memdup(struct mempool *p, const void *s, size_t len)
 {
   void *t = mp_alloc_fast(p, len);
   memcpy(t, s, len);
@@ -42,8 +42,8 @@ mp_multicat(struct mempool *p, ...)
   va_copy(a, args);
   while (x = va_arg(a, char *))
     cnt++;
-  uint *sizes = alloca(cnt * sizeof(uint));
-  uint len = 1;
+  size_t *sizes = alloca(cnt * sizeof(*sizes));
+  size_t len = 1;
   cnt = 0;
   va_end(a);
   va_copy(a, args);
@@ -66,8 +66,8 @@ mp_multicat(struct mempool *p, ...)
 char *
 mp_strjoin(struct mempool *p, char **a, uint n, uint sep)
 {
-  uint sizes[n];
-  uint len = 1;
+  size_t sizes[n];
+  size_t len = 1;
   for (uint i=0; i<n; i++)
     len += sizes[i] = strlen(a[i]);
   if (sep && n)
@@ -86,7 +86,7 @@ mp_strjoin(struct mempool *p, char **a, uint n, uint sep)
 }
 
 char *
-mp_str_from_mem(struct mempool *a, const void *mem, uint len)
+mp_str_from_mem(struct mempool *a, const void *mem, size_t len)
 {
   char *str = mp_alloc_noalign(a, len+1);
   memcpy(str, mem, len);