summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2016-10-03 13:00:50 +0200
committerZdenek Kabelac <zkabelac@redhat.com>2016-10-03 17:49:55 +0200
commitcea441f4d1e19f170d9161203ef843c59f3fbf70 (patch)
tree0cce4f2b345159a431a4b70ce8cb8962e488aff0
parent00f883a4aa10079bac21c294ce5ed34f11af8ac7 (diff)
downloadlvm2-cea441f4d1e19f170d9161203ef843c59f3fbf70.tar.gz
cleanup: simplier assign of cmd vars
Directly assign queried args as they provide matching values for a setting.
-rw-r--r--tools/lvmcmdline.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 9a4deb7d5..bd29e2539 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1049,23 +1049,19 @@ static int _get_settings(struct cmd_context *cmd)
const char *activation_mode;
cmd->current_settings = cmd->default_settings;
+ cmd->current_settings.verbose = arg_count(cmd, verbose_ARG);
+ cmd->current_settings.test = arg_is_set(cmd, test_ARG);
if (arg_is_set(cmd, debug_ARG))
cmd->current_settings.debug = _LOG_FATAL +
(arg_count(cmd, debug_ARG) - 1);
- if (arg_is_set(cmd, verbose_ARG))
- cmd->current_settings.verbose = arg_count(cmd, verbose_ARG);
-
if (arg_is_set(cmd, quiet_ARG)) {
cmd->current_settings.debug = 0;
cmd->current_settings.verbose = 0;
cmd->current_settings.silent = (arg_count(cmd, quiet_ARG) > 1) ? 1 : 0;
}
- if (arg_is_set(cmd, test_ARG))
- cmd->current_settings.test = arg_is_set(cmd, test_ARG);
-
if (arg_is_set(cmd, driverloaded_ARG)) {
cmd->current_settings.activation =
arg_int_value(cmd, driverloaded_ARG,