fixup: don't standard mapping code in mid of cmd helpers

as it teared code which belongs together apart

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/src/PVE/CLIHandler.pm b/src/PVE/CLIHandler.pm
index 1ad1b65e9e352aeb7780fbc61ad6114214c7845b..c68aae8f95c5273b2d0c5705519d58bc5acd9346 100644 (file)
--- a/src/PVE/CLIHandler.pm
+++ b/src/PVE/CLIHandler.pm
@@ -38,6 +38,34 @@ my $cmddef;
 my $exename;
 my $cli_handler_class;
 
 my $exename;
 my $cli_handler_class;
 

+my $standard_mappings = {
+    'pve-password' => {
+       name => 'password',
+       desc => '<password>',
+       interactive => 1,
+       func => sub {
+           my ($value) = @_;
+           return $value if $value;
+           return PVE::PTY::get_confirmed_password();
+       },
+    },
+};
+sub get_standard_mapping {
+    my ($name, $base) = @_;
+
+    my $std = $standard_mappings->{$name};
+    die "no such standard mapping '$name'\n" if !$std;
+
+    my $res = $base || {};
+
+    foreach my $opt (keys %$std) {
+       next if defined($res->{$opt});
+       $res->{$opt} = $std->{$opt};
+    }
+
+    return $res;
+}
+

 my $assert_initialized = sub {
     my @caller = caller;
     die "$caller[0]:$caller[2] - not initialized\n"
 my $assert_initialized = sub {
     my @caller = caller;
     die "$caller[0]:$caller[2] - not initialized\n"


@@ -70,35 +98,6 @@ my $get_commands = sub {
 
 my $complete_command_names = sub { $get_commands->($cmddef) };
 
 
 my $complete_command_names = sub { $get_commands->($cmddef) };
 

-my $standard_mappings = {
-    'pve-password' => {
-       name => 'password',
-       desc => '<password>',
-       interactive => 1,
-       func => sub {
-           my ($value) = @_;
-           return $value if $value;
-           return PVE::PTY::get_confirmed_password();
-       },
-    },
-};
-
-sub get_standard_mapping {
-    my ($name, $base) = @_;
-
-    my $std =  $standard_mappings->{$name};
-    die "no such standard mapping '$name'\n" if !$std;
-
-    my $res = $base || {};
-
-    foreach my $opt (keys %$std) {
-       next if defined($res->{$opt});
-       $res->{$opt} = $std->{$opt};
-    }
-
-    return $res;
-}
-

 # traverses the command definition using the $argv array, resolving one level
 # of aliases.
 # Returns the matching (sub) command and its definition, and argument array for
 # traverses the command definition using the $argv array, resolving one level
 # of aliases.
 # Returns the matching (sub) command and its definition, and argument array for