From 097d14e64e845bdb1c0b8106e33f38f775e54fe5 Mon Sep 17 00:00:00 2001 From: Peter Rajnoha Date: Tue, 20 Oct 2015 14:09:09 +0200 Subject: [PATCH] str_list: also allow memory allocation without memory pool --- lib/datastruct/str_list.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/datastruct/str_list.c b/lib/datastruct/str_list.c index 1d3f08ad1..25ffddd2c 100644 --- a/lib/datastruct/str_list.c +++ b/lib/datastruct/str_list.c @@ -20,7 +20,8 @@ struct dm_list *str_list_create(struct dm_pool *mem) { struct dm_list *sl; - if (!(sl = dm_pool_alloc(mem, sizeof(struct dm_list)))) { + if (!(sl = mem ? dm_pool_alloc(mem, sizeof(struct dm_list)) + : dm_malloc(sizeof(struct dm_list)))) { log_errno(ENOMEM, "str_list allocation failed"); return NULL; } @@ -37,7 +38,8 @@ static int _str_list_add_no_dup_check(struct dm_pool *mem, struct dm_list *sll, if (!str) return_0; - if (!(sln = dm_pool_alloc(mem, sizeof(*sln)))) + if (!(sln = mem ? dm_pool_alloc(mem, sizeof(*sln)) + : dm_malloc(sizeof(*sln)))) return_0; sln->str = str;