summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Rajnoha <prajnoha@redhat.com>2016-06-13 15:23:44 +0200
committerPeter Rajnoha <prajnoha@redhat.com>2016-06-20 11:33:43 +0200
commit5b93db65660c5dbb5b68d458ffa4c034a4c37211 (patch)
tree1cfa13ffd9f0251e2043967b381571508eabcada
parent1127b090bd07065a6a5046881ba1692bd507b9da (diff)
downloadlvm2-5b93db65660c5dbb5b68d458ffa4c034a4c37211.tar.gz
libdm: select: recognize special selection string 'all' as an alias for blank selection string
-rw-r--r--WHATS_NEW_DM1
-rw-r--r--libdm/libdm-report.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 1772e1866..8911e36d3 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
Version 1.02.128 -
=================================
+ Recognize 'all' keyword used in selection as synonym for "" (no selection).
Add dm_report_set_selection to set selection for multiple output of report.
Add DM_REPORT_OUTPUT_MULTIPLE_TIMES flag for multiple output of same report.
Move field width handling/sort init from dm_report_object to dm_report_output.
diff --git a/libdm/libdm-report.c b/libdm/libdm-report.c
index cae9c6642..1326fdf2c 100644
--- a/libdm/libdm-report.c
+++ b/libdm/libdm-report.c
@@ -3984,6 +3984,8 @@ static int _alloc_rh_selection(struct dm_report *rh)
return 1;
}
+#define SPECIAL_SELECTION_ALL "all"
+
static int _report_set_selection(struct dm_report *rh, const char *selection, int add_new_fields)
{
struct selection_node *root = NULL;
@@ -3999,7 +4001,7 @@ static int _report_set_selection(struct dm_report *rh, const char *selection, in
goto_bad;
}
- if (!selection)
+ if (!selection || !strcasecmp(selection, SPECIAL_SELECTION_ALL))
return 1;
rh->selection->add_new_fields = add_new_fields;