Mempools: Implemented mp_str_from_mem()

diff --git a/ucw/mempool-str.c b/ucw/mempool-str.c
index 970c9f4e826439d11e9eeaa1c3a689926bd1ff13..9391cbb6eb1db3b8739d74ed364a5a619c7c71bb 100644 (file)
--- a/ucw/mempool-str.c
+++ b/ucw/mempool-str.c
@@ -85,6 +85,15 @@ mp_strjoin(struct mempool *p, char **a, uns n, uns sep)
   return dest;
 }
 
+char *
+mp_str_from_mem(struct mempool *a, const void *mem, uns len)
+{
+  char *str = mp_alloc_noalign(a, len+1);
+  memcpy(str, mem, len);
+  str[len] = 0;
+  return str;
+}
+
 #ifdef TEST
 
 #include <stdio.h>
@@ -98,6 +107,7 @@ int main(void)
   char *a[] = { "bugs", "gnats", "insects" };
   puts(mp_strjoin(p, a, 3, '.'));
   puts(mp_strjoin(p, a, 3, 0));
+  puts(mp_str_from_mem(p, s+1, 2));
   return 0;
 }
 

diff --git a/ucw/mempool.h b/ucw/mempool.h
index bcc22bd35bcf755e0aca15ad05e15655bd66332b..350054e3fc481d0eb8a8879daabb1c1d021f7178 100644 (file)
--- a/ucw/mempool.h
+++ b/ucw/mempool.h
@@ -410,6 +410,11 @@ static inline char *LIKE_MALLOC mp_strcat(struct mempool *mp, const char *x, con
  * tells how many there is of them.
  **/
 char *mp_strjoin(struct mempool *p, char **a, uns n, uns sep) LIKE_MALLOC;
+/**
+ * Convert memory block to a string. Makes a copy of the given memory block
+ * in the mempool @p, adding an extra terminating zero byte at the end.
+ **/
+char *mp_str_from_mem(struct mempool *p, const void *mem, uns len) LIKE_MALLOC;
 
 
 /***

diff --git a/ucw/mempool.t b/ucw/mempool.t
index 3aeb2558a62ebbea98fa4ddbdd8aa0dcfdaf8f8f..61956d49483e16d5b2e332aebaf225e523d9ee11 100644 (file)
--- a/ucw/mempool.t
+++ b/ucw/mempool.t
@@ -9,3 +9,4 @@ Run:    ../obj/ucw/mempool-str-t
 Out:   <<12345>>
        bugs.gnats.insects
        bugsgnatsinsects
+       23