Remove init_debug() calls immediately after create_toolcontext() call.

We can safely remove because create_toolcontext() calls _init_logging(),
which makes these calls:
        /* Debug level for log file output */
        cmd->default_settings.debug =
            find_config_tree_int(cmd, "log/level", DEFAULT_LOGLEVEL);
        init_debug(cmd->default_settings.debug);

Then at the bottom of create_toolcontext() we do this:
        cmd->current_settings = cmd->default_settings;

So the call we are removing from init_lvm() functions (clvmd and lvmcmdline):
        init_debug(cmd->current_settings.debug);

Just sets the value of debug based on 'cmd->current_settings.debug'.
Since cmd->current_settings is equivalent to cmd->default_settings, and
init_debug() was called with cmd->default_settings, the call we remove is
redundant.

diff --git a/daemons/clvmd/lvm-functions.c b/daemons/clvmd/lvm-functions.c
index 621493cc36a6e7675d173cc049b7df3397b281aa..1a7b1983f70bd05927d0b46058fa6115007ca873 100644 (file)
--- a/daemons/clvmd/lvm-functions.c
+++ b/daemons/clvmd/lvm-functions.c
@@ -732,7 +732,6 @@ int init_lvm(int using_gulm)
        /* Use LOG_DAEMON for syslog messages instead of LOG_USER */
        init_syslog(LOG_DAEMON);
        openlog("clvmd", LOG_PID, LOG_DAEMON);
-       init_debug(cmd->current_settings.debug);
        init_verbose(cmd->current_settings.verbose + VERBOSE_BASE_LEVEL);
        set_activation(cmd->current_settings.activation);
        archive_enable(cmd, cmd->current_settings.archive);

diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 37ae834f96ecdb7ffdff87640a9a7034ea5fb37f..fdffed3e6fec7435ecfaac4035c7f766f937a411 100644 (file)
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1091,7 +1091,6 @@ struct cmd_context *init_lvm(unsigned is_static)
        if (!(cmd = create_toolcontext(_cmdline.the_args, is_static, 0)))
                return_NULL;
 
-       init_debug(cmd->current_settings.debug);
        init_verbose(cmd->current_settings.verbose + VERBOSE_BASE_LEVEL);
        init_test(cmd->current_settings.test);
        init_full_scan_done(0);