shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

Add tags_format_and_copy() common function and call from _tags_disp.

Browse Source 
Add a common function to allocate memory and format a string of
tags.
Call tags_format_and_copy() from _tags_disp().
This commit is contained in:
Dave Wysochanski 2010-09-30 14:08:07 +00:00
parent 254d672dcc
commit f15033c0e1
3 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/metadata/metadata.c
View File

@ -3937,6 +3937,30 @@ char alloc_policy_char(alloc_policy_t alloc)
}
}
char *tags_format_and_copy(struct dm_pool *mem, const struct dm_list *tags)
{
struct str_list *sl;
if (!dm_pool_begin_object(mem, 256)) {
log_error("dm_pool_begin_object failed");
return NULL;
}
dm_list_iterate_items(sl, tags) {
if (!dm_pool_grow_object(mem, sl->str, strlen(sl->str)) ||
(sl->list.n != tags && !dm_pool_grow_object(mem, ",", 1))) {
log_error("dm_pool_grow_object failed");
return NULL;
}
}
if (!dm_pool_grow_object(mem, "\0", 1)) {
log_error("dm_pool_grow_object failed");
return NULL;
}
return dm_pool_end_object(mem);
}
/**
* pv_by_path - Given a device path return a PV handle if it is a PV
* @cmd - handle to the LVM command instance

1
lib/metadata/metadata.h
View File

@ -413,5 +413,6 @@ int is_mirror_image_removable(struct logical_volume *mimage_lv, void *baton);
uint64_t find_min_mda_size(struct dm_list *mdas);
char alloc_policy_char(alloc_policy_t alloc);
char *tags_format_and_copy(struct dm_pool *mem, const struct dm_list *tags);
#endif

21
lib/report/report.c
View File

@ -150,27 +150,12 @@ static int _tags_disp(struct dm_report *rh __attribute__((unused)), struct dm_po
const void *data, void *private __attribute__((unused)))
{
const struct dm_list *tags = (const struct dm_list *) data;
struct str_list *sl;
char *tags_str;
if (!dm_pool_begin_object(mem, 256)) {
log_error("dm_pool_begin_object failed");
if (!(tags_str = tags_format_and_copy(mem, tags)))
return 0;
}
dm_list_iterate_items(sl, tags) {
if (!dm_pool_grow_object(mem, sl->str, strlen(sl->str)) ||
(sl->list.n != tags && !dm_pool_grow_object(mem, ",", 1))) {
log_error("dm_pool_grow_object failed");
return 0;
}
}
if (!dm_pool_grow_object(mem, "\0", 1)) {
log_error("dm_pool_grow_object failed");
return 0;
}
dm_report_field_set_value(field, dm_pool_end_object(mem), NULL);
dm_report_field_set_value(field, tags_str, NULL);
return 1;
}