summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominique Dumont <dod@debian.org>2021-06-04 18:46:58 +0200
committerDominique Dumont <dod@debian.org>2021-06-04 18:46:58 +0200
commitd74039596792aca69b8185b1fe3946bbdc401084 (patch)
treef8487027ed654d704ca04cd166b13f56af5d8489
parent461de20f63961902a92b482f30428c62e5f44806 (diff)
unpack arguments before use
when possible
-rw-r--r--lib/Config/Model/Backend/Dpkg.pm5
-rw-r--r--lib/Config/Model/Backend/Dpkg/Autopkgtest.pm10
-rw-r--r--lib/Config/Model/Backend/Dpkg/Control.pm10
-rw-r--r--lib/Config/Model/Backend/Dpkg/Copyright.pm10
-rw-r--r--lib/Config/Model/Backend/Dpkg/Meta.pm10
-rw-r--r--lib/Config/Model/Backend/Dpkg/Patch.pm14
-rw-r--r--lib/Config/Model/Dpkg/Copyright/License.pm4
-rw-r--r--lib/Config/Model/Dpkg/Dependency.pm12
8 files changed, 17 insertions, 58 deletions
diff --git a/lib/Config/Model/Backend/Dpkg.pm b/lib/Config/Model/Backend/Dpkg.pm
index 01b84a0c..e5e196d5 100644
--- a/lib/Config/Model/Backend/Dpkg.pm
+++ b/lib/Config/Model/Backend/Dpkg.pm
@@ -130,10 +130,7 @@ my %write_hash_dispatch = (
'lintian-overrides' => \&write_lintian_overrides,
);
-sub write {
- my $self = shift;
- my %args = @_;
-
+sub write ($self, %args) { ## no critic (ProhibitBuiltinHomonyms)
# args are:
# object => $obj, # Config::Model::Node object
# root => './my_test', # fake root directory, userd for tests
diff --git a/lib/Config/Model/Backend/Dpkg/Autopkgtest.pm b/lib/Config/Model/Backend/Dpkg/Autopkgtest.pm
index f073d640..c3495351 100644
--- a/lib/Config/Model/Backend/Dpkg/Autopkgtest.pm
+++ b/lib/Config/Model/Backend/Dpkg/Autopkgtest.pm
@@ -22,10 +22,7 @@ use IO::File;
my $logger = get_logger("Backend::Dpkg::Autopkgtest");
my $user_logger = get_logger('User');
-sub read {
- my $self = shift;
- my %args = @_;
-
+sub read ($self, %args) { ## no critic (ProhibitBuiltinHomonyms)
# args is:
# object => $obj, # Config::Model::Node object
# root => './my_test', # fake root directory, userd for tests
@@ -75,10 +72,7 @@ sub parse_control_file ($self, $control_file, $node, $check) {
return;
}
-sub write {
- my $self = shift;
- my %args = @_;
-
+sub write ($self, %args) { ## no critic (ProhibitBuiltinHomonyms)
# args is:
# object => $obj, # Config::Model::Node object
# root => './my_test', # fake root directory, userd for tests
diff --git a/lib/Config/Model/Backend/Dpkg/Control.pm b/lib/Config/Model/Backend/Dpkg/Control.pm
index 5e95e19c..225385e3 100644
--- a/lib/Config/Model/Backend/Dpkg/Control.pm
+++ b/lib/Config/Model/Backend/Dpkg/Control.pm
@@ -21,10 +21,7 @@ use Config::Model::Dpkg::Dependency;
my $logger = get_logger("Backend::Dpkg::Control") ;
-sub read {
- my $self = shift ;
- my %args = @_ ;
-
+sub read ($self, %args) { ## no critic (ProhibitBuiltinHomonyms)
# args is:
# object => $obj, # Config::Model::Node object
# root => './my_test', # fake root directory, userd for tests
@@ -202,10 +199,7 @@ sub store_section_element_in_tree {
}
-sub write {
- my $self = shift ;
- my %args = @_ ;
-
+sub write ($self, %args) { ## no critic (ProhibitBuiltinHomonyms)
# args is:
# object => $obj, # Config::Model::Node object
# root => './my_test', # fake root directory, userd for tests
diff --git a/lib/Config/Model/Backend/Dpkg/Copyright.pm b/lib/Config/Model/Backend/Dpkg/Copyright.pm
index 8d286440..6966bc90 100644
--- a/lib/Config/Model/Backend/Dpkg/Copyright.pm
+++ b/lib/Config/Model/Backend/Dpkg/Copyright.pm
@@ -31,10 +31,7 @@ my %store_dispatch = (
uniline => 'store_section_leaf_element',
);
-sub read {
- my $self = shift ;
- my %args = @_ ;
-
+sub read ($self, %args) { ## no critic (ProhibitBuiltinHomonyms)
# args is:
# object => $obj, # Config::Model::Node object
# root => './my_test', # fake root directory, userd for tests
@@ -323,10 +320,7 @@ sub _store_file_license ($self, $lic_object, $check, $v_ref) {
return;
}
-sub write {
- my $self = shift;
- my %args = @_;
-
+sub write ($self, %args) { ## no critic (ProhibitBuiltinHomonyms)
# args is:
# object => $obj, # Config::Model::Node object
# root => './my_test', # fake root directory, userd for tests
diff --git a/lib/Config/Model/Backend/Dpkg/Meta.pm b/lib/Config/Model/Backend/Dpkg/Meta.pm
index df38aa44..3b46b745 100644
--- a/lib/Config/Model/Backend/Dpkg/Meta.pm
+++ b/lib/Config/Model/Backend/Dpkg/Meta.pm
@@ -54,10 +54,7 @@ sub _get_cfg_dir {
return $file;
}
-sub read {
- my $self = shift;
- my %args = @_;
-
+sub read ($self, %args) { ## no critic (ProhibitBuiltinHomonyms)
# args is:
# object => $obj, # Config::Model::Node object
# root => './my_test', # fake root directory, userd for tests
@@ -98,10 +95,7 @@ sub read {
return 1;
}
-sub write {
- my $self = shift;
- my %args = @_;
-
+sub write ($self, %args) { ## no critic (ProhibitBuiltinHomonyms)
# args is:
# object => $obj, # Config::Model::Node object
# root => './my_test', # fake root directory, userd for tests
diff --git a/lib/Config/Model/Backend/Dpkg/Patch.pm b/lib/Config/Model/Backend/Dpkg/Patch.pm
index 7396156c..33dfca17 100644
--- a/lib/Config/Model/Backend/Dpkg/Patch.pm
+++ b/lib/Config/Model/Backend/Dpkg/Patch.pm
@@ -24,9 +24,7 @@ my $logger = get_logger("Backend::Dpkg::Patch");
sub skip_open { return 1;}
# TODO: use a role provided by Config::Model
-sub cfg_path {
- my $self = shift;
- my %args = @_;
+sub cfg_path ($self, %args) {
my $cfg_dir = $args{config_dir};
my $dir
= $args{root} ? path($args{root})->child($cfg_dir)
@@ -35,10 +33,7 @@ sub cfg_path {
return $dir;
}
-sub read {
- my $self = shift;
- my %args = @_;
-
+sub read ($self, %args) { ## no critic (ProhibitBuiltinHomonyms)
# args is:
# object => $obj, # Config::Model::Node object
# root => './my_test', # fake root directory, userd for tests
@@ -169,10 +164,7 @@ sub read {
return 1;
}
-sub write {
- my $self = shift;
- my %args = @_;
-
+sub write ($self, %args) { ## no critic (ProhibitBuiltinHomonyms)
# args is:
# object => $obj, # Config::Model::Node object
# root => './my_test', # fake root directory, userd for tests
diff --git a/lib/Config/Model/Dpkg/Copyright/License.pm b/lib/Config/Model/Dpkg/Copyright/License.pm
index c9dfbd36..36ea7ae5 100644
--- a/lib/Config/Model/Dpkg/Copyright/License.pm
+++ b/lib/Config/Model/Dpkg/Copyright/License.pm
@@ -22,10 +22,10 @@ sub BUILD ($self, @args) {
$self-> add_check_content( sub { $self->check_unused_licenses(@_);} )
}
-sub check_idx {
+sub check_idx { ## no critic (RequireArgUnpacking)
my $self = shift;
-
my %args = @_ > 1 ? @_ : ( index => $_[0] );
+
my $idx = $args{index};
my $silent = $args{silent} || 0;
my $check = $args{check} || 'yes';
diff --git a/lib/Config/Model/Dpkg/Dependency.pm b/lib/Config/Model/Dpkg/Dependency.pm
index 87d6d0a8..ff4d2dc8 100644
--- a/lib/Config/Model/Dpkg/Dependency.pm
+++ b/lib/Config/Model/Dpkg/Dependency.pm
@@ -339,7 +339,7 @@ sub dep_parser {
# check_dep -> meta filter -> control maintainer -> create control class
# autoread started -> read all fileds -> read dependency -> check_dep ...
-sub check_value {
+sub check_value { ## no critic (RequireArgUnpacking)
my $self = shift ;
my %args = @_ > 1 ? @_ : (value => $_[0]) ;
@@ -349,10 +349,7 @@ sub check_value {
return $self->check_dependency(%args, value => $value, ok => $ok) ;
}
-sub check_dependency {
- my $self = shift;
- my %args = @_ ;
-
+sub check_dependency ($self, %args){
my ($value, $check, $silent, $notify_change, $ok, $apply_fix)
= @args{qw/value check silent notify_change ok fix/} ;
@@ -526,10 +523,7 @@ sub check_compat_value ($self, $compat_value, $apply_fix, $msgs) {
return $compat_value;
}
-sub struct_to_dep {
- my $self = shift ;
- my @input = @_ ;
-
+sub struct_to_dep ($self, @input) {
my @alternatives ;
foreach my $d (@input) {
my $line = '';