Clean up process_args

* Delete unused variable `%opts`
  * Ensure that `%opt` exists before it is referenced in `process_args`
  * Don't bother returning a copy of `%opt`
This commit is contained in:
Richard Hansen 2020-05-25 22:36:31 -04:00
parent 7a9991966b
commit 5211cb55c8

View file

@ -743,6 +743,9 @@ $variables{'merged'} = merge($variables{'global-defaults'},
map { $services{$_}{'variables'} } keys %services, map { $services{$_}{'variables'} } keys %services,
); );
# This will hold the processed args.
my %opt = ();
my @opt = ( my @opt = (
"usage: ${program} [options]", "usage: ${program} [options]",
"options are:", "options are:",
@ -810,7 +813,7 @@ my @opt = (
); );
## process args ## process args
my ($opt_usage, %opt) = process_args(@opt); my $opt_usage = process_args(@opt);
my ($result, %config, %globals, %cache); my ($result, %config, %globals, %cache);
my $saved_cache = ''; my $saved_cache = '';
my %saved_opt = %opt; my %saved_opt = %opt;
@ -1449,7 +1452,6 @@ sub usage {
sub process_args { sub process_args {
my @spec = (); my @spec = ();
my $usage = ""; my $usage = "";
my %opts = ();
foreach (@_) { foreach (@_) {
if (ref $_) { if (ref $_) {
@ -1486,7 +1488,7 @@ sub process_args {
if (! GetOptions(\%opt, @spec)) { if (! GetOptions(\%opt, @spec)) {
$opt{"help"} = 1; $opt{"help"} = 1;
} }
return ($usage, %opt); return $usage;
} }
###################################################################### ######################################################################
## test_possible_ip - print possible IPs ## test_possible_ip - print possible IPs