shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-10-27 10:25:13 +03:00
Code Releases Activity

report: also recognize variants without underscores for <prefix>_all fields

Browse Source 
For example: "pvs -o pv_all" and pvs -o pvall" are same.
This commit is contained in:
Peter Rajnoha 2015-08-04 09:03:31 +02:00
parent d11f8d4228
commit 6ac5689ce4
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libdm/libdm-report.c
View File

@ -876,15 +876,20 @@ static void _all_match_combine(const struct dm_report_object_type *types,
const char *field, size_t flen,
uint32_t *report_types)
{
char field_canon[DM_REPORT_FIELD_TYPE_ID_LEN];
const struct dm_report_object_type *t;
size_t prefix_len;
for (t = types; t->data_fn; t++) {
prefix_len = strlen(t->prefix);
if (!_get_canonical_field_name(field, flen, field_canon, DM_REPORT_FIELD_TYPE_ID_LEN, NULL))
return;
flen = strlen(field_canon);
if (!strncasecmp(t->prefix, field, prefix_len) &&
for (t = types; t->data_fn; t++) {
prefix_len = strlen(t->prefix) - 1;
if (!strncasecmp(t->prefix, field_canon, prefix_len) &&
((unprefixed_all_matched && (flen == prefix_len)) ||
(!strncasecmp(field + prefix_len, "all", 3) &&
(!strncasecmp(field_canon + prefix_len, "all", 3) &&
(flen == prefix_len + 3))))
*report_types |= t->id;
}