1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00

datastruct: Add str_list_add_list.

This commit is contained in:
Alasdair G Kergon 2015-03-26 18:30:37 +00:00
parent 8a87fadbb0
commit 9506760c7e
3 changed files with 17 additions and 0 deletions

View File

@ -1,5 +1,6 @@
Version 2.02.119 - Version 2.02.119 -
================================== ==================================
Add str_list_add_list() to combine two lists.
Fix LV processing with selection to always do the selection on initial state. Fix LV processing with selection to always do the selection on initial state.
Version 2.02.118 - 23rd March 2015 Version 2.02.118 - 23rd March 2015

View File

@ -71,6 +71,21 @@ int str_list_add(struct dm_pool *mem, struct dm_list *sll, const char *str)
return str_list_add_no_dup_check(mem, sll, str); return str_list_add_no_dup_check(mem, sll, str);
} }
/* Add contents of sll2 to sll */
int str_list_add_list(struct dm_pool *mem, struct dm_list *sll, struct dm_list *sll2)
{
struct dm_str_list *sl;
if (!sll2)
return_0;
dm_list_iterate_items(sl, sll2)
if (!str_list_add(mem, sll, sl->str))
return_0;
return 1;
}
void str_list_del(struct dm_list *sll, const char *str) void str_list_del(struct dm_list *sll, const char *str)
{ {
struct dm_list *slh, *slht; struct dm_list *slh, *slht;

View File

@ -21,6 +21,7 @@ struct dm_pool;
struct dm_list *str_list_create(struct dm_pool *mem); struct dm_list *str_list_create(struct dm_pool *mem);
int str_list_add(struct dm_pool *mem, struct dm_list *sll, const char *str); int str_list_add(struct dm_pool *mem, struct dm_list *sll, const char *str);
int str_list_add_list(struct dm_pool *mem, struct dm_list *sll, struct dm_list *sll2);
int str_list_add_no_dup_check(struct dm_pool *mem, struct dm_list *sll, const char *str); int str_list_add_no_dup_check(struct dm_pool *mem, struct dm_list *sll, const char *str);
int str_list_add_h_no_dup_check(struct dm_pool *mem, struct dm_list *sll, const char *str); int str_list_add_h_no_dup_check(struct dm_pool *mem, struct dm_list *sll, const char *str);
void str_list_del(struct dm_list *sll, const char *str); void str_list_del(struct dm_list *sll, const char *str);