don't inline pool_zalloc(); lift duplicated pool_str(n)dup to pool.c

diff --git a/lib/mm/pool-debug.c b/lib/mm/pool-debug.c
index 9065346cad6d189d1557c87a9f7297651c071094..dad81af7b21ade76d274d2d5eef4227543459412 100644 (file)
--- a/lib/mm/pool-debug.c
+++ b/lib/mm/pool-debug.c
@@ -195,25 +195,3 @@ void pool_abandon_object(struct pool *p)
        p->begun = 0;
        p->object = NULL;
 }
-
-char *pool_strdup(struct pool *p, const char *str)
-{
-       char *ret = pool_alloc(p, strlen(str) + 1);
-
-       if (ret)
-               strcpy(ret, str);
-
-       return ret;
-}
-
-char *pool_strndup(struct pool *p, const char *str, size_t n)
-{
-       char *ret = pool_alloc(p, n + 1);
-
-       if (ret) {
-               strncpy(ret, str, n);
-               ret[n] = '\0';
-       }
-
-       return ret;
-}

diff --git a/lib/mm/pool-fast.c b/lib/mm/pool-fast.c
index 9d40e9391cf3661d485982d8a86582f4163ab68d..c2f26e0eb58f1e5a9ddddd866d3e92717dc67538 100644 (file)
--- a/lib/mm/pool-fast.c
+++ b/lib/mm/pool-fast.c
@@ -195,28 +195,6 @@ void pool_abandon_object(struct pool *p)
        p->object_alignment = DEFAULT_ALIGNMENT;
 }
 
-char *pool_strdup(struct pool *p, const char *str)
-{
-       char *ret = pool_alloc(p, strlen(str) + 1);
-
-       if (ret)
-               strcpy(ret, str);
-
-       return ret;
-}
-
-char *pool_strndup(struct pool *p, const char *str, size_t n)
-{
-       char *ret = pool_alloc(p, n + 1);
-
-       if (ret) {
-               strncpy(ret, str, n);
-               ret[n] = '\0';
-       }
-
-       return ret;
-}
-
 void _align_chunk(struct chunk *c, unsigned alignment)
 {
        c->begin += alignment - ((unsigned long) c->begin & (alignment - 1));

diff --git a/lib/mm/pool.c b/lib/mm/pool.c
index 2cbad670df7a088f091513165ddefc37bbf702a8..bbb77dcc85b91b897ddbf42909f621d7bb1247da 100644 (file)
--- a/lib/mm/pool.c
+++ b/lib/mm/pool.c
@@ -9,3 +9,35 @@
 #else
 #include "pool-fast.c"
 #endif
+
+char *pool_strdup(struct pool *p, const char *str)
+{
+       char *ret = pool_alloc(p, strlen(str) + 1);
+
+       if (ret)
+               strcpy(ret, str);
+
+       return ret;
+}
+
+char *pool_strndup(struct pool *p, const char *str, size_t n)
+{
+       char *ret = pool_alloc(p, n + 1);
+
+       if (ret) {
+               strncpy(ret, str, n);
+               ret[n] = '\0';
+       }
+
+       return ret;
+}
+
+void *pool_zalloc(struct pool *p, size_t s)
+{
+       void *ptr = pool_alloc(p, s);
+
+       if (ptr)
+               memset(ptr, 0, s);
+
+       return ptr;
+}

diff --git a/lib/mm/pool.h b/lib/mm/pool.h
index 4e82617dc5ffabffa2f0c25e6ffe5682b7812518..f3806569e72c87d9063230caddd54da25b1e2099 100644 (file)
--- a/lib/mm/pool.h
+++ b/lib/mm/pool.h
@@ -107,15 +107,6 @@ void pool_abandon_object(struct pool *p);
 /* utilities */
 char *pool_strdup(struct pool *p, const char *str);
 char *pool_strndup(struct pool *p, const char *str, size_t n);
-
-static inline void *pool_zalloc(struct pool *p, size_t s)
-{
-       void *ptr = pool_alloc(p, s);
-
-       if (ptr)
-               memset(ptr, 0, s);
-
-       return ptr;
-}
+void *pool_zalloc(struct pool *p, size_t s);
 
 #endif