Просмотр исходного кода

scripts: Use // operator instead of defined and ternary operator

Guillem Jover лет назад: 12
Родитель
Сommit
f18b4447ae

+ 2 - 2
scripts/Dpkg/Deps.pm

@@ -341,8 +341,8 @@ sub deps_compare {
 	my @deps = $b->get_deps();
 	my @deps = $b->get_deps();
 	$b = $deps[0];
 	$b = $deps[0];
     }
     }
-    my $ar = defined($a->{relation}) ? $a->{relation} : 'undef';
-    my $br = defined($b->{relation}) ? $b->{relation} : 'undef';
+    my $ar = $a->{relation} // 'undef';
+    my $br = $b->{relation} // 'undef';
     return (($a->{package} cmp $b->{package}) ||
     return (($a->{package} cmp $b->{package}) ||
 	    ($relation_ordering{$ar} <=> $relation_ordering{$br}) ||
 	    ($relation_ordering{$ar} <=> $relation_ordering{$br}) ||
 	    ($a->{version} cmp $b->{version}));
 	    ($a->{version} cmp $b->{version}));

+ 2 - 2
scripts/Dpkg/Shlibs/Objdump.pm

@@ -311,7 +311,7 @@ sub parse_dynamic_symbol {
 
 
 	my $symbol = {
 	my $symbol = {
 		name => $name,
 		name => $name,
-		version => defined($ver) ? $ver : '',
+		version => $ver // '',
 		section => $sect,
 		section => $sect,
 		dynamic => substr($flags, 5, 1) eq 'D',
 		dynamic => substr($flags, 5, 1) eq 'D',
 		debug => substr($flags, 5, 1) eq 'd',
 		debug => substr($flags, 5, 1) eq 'd',
@@ -319,7 +319,7 @@ sub parse_dynamic_symbol {
 		weak => substr($flags, 1, 1) eq 'w',
 		weak => substr($flags, 1, 1) eq 'w',
 		local => substr($flags, 0, 1) eq 'l',
 		local => substr($flags, 0, 1) eq 'l',
 		global => substr($flags, 0, 1) eq 'g',
 		global => substr($flags, 0, 1) eq 'g',
-		visibility => defined($vis) ? $vis : '',
+		visibility => $vis // '',
 		hidden => '',
 		hidden => '',
 		defined => $sect ne '*UND*'
 		defined => $sect ne '*UND*'
 	    };
 	    };

+ 1 - 1
scripts/Dpkg/Shlibs/Symbol.pm

@@ -127,7 +127,7 @@ sub parse_symbolspec {
     # Now parse "the rest" (minver and dep_id)
     # Now parse "the rest" (minver and dep_id)
     if ($rest =~ /^\s(\S+)(?:\s(\d+))?/) {
     if ($rest =~ /^\s(\S+)(?:\s(\d+))?/) {
 	$self->{minver} = $1;
 	$self->{minver} = $1;
-	$self->{dep_id} = defined($2) ? $2 : 0;
+	$self->{dep_id} = $2 // 0;
     } elsif (defined $opts{default_minver}) {
     } elsif (defined $opts{default_minver}) {
 	$self->{minver} = $opts{default_minver};
 	$self->{minver} = $opts{default_minver};
 	$self->{dep_id} = 0;
 	$self->{dep_id} = 0;

+ 1 - 1
scripts/dpkg-gensymbols.pl

@@ -98,7 +98,7 @@ while (@ARGV) {
 	my $err = pkg_name_is_illegal($oppackage);
 	my $err = pkg_name_is_illegal($oppackage);
 	error(_g("illegal package name '%s': %s"), $oppackage, $err) if $err;
 	error(_g("illegal package name '%s': %s"), $oppackage, $err) if $err;
     } elsif (m/^-c(\d)?$/) {
     } elsif (m/^-c(\d)?$/) {
-	$compare = defined($1) ? $1 : 1;
+	$compare = $1 // 1;
     } elsif (m/^-q$/) {
     } elsif (m/^-q$/) {
 	$quiet = 1;
 	$quiet = 1;
     } elsif (m/^-d$/) {
     } elsif (m/^-d$/) {

+ 1 - 1
scripts/dpkg-scanpackages.pl

@@ -161,7 +161,7 @@ if (not (@ARGV >= 1 and @ARGV <= 3)) {
     usageerr(_g('one to three arguments expected'));
     usageerr(_g('one to three arguments expected'));
 }
 }
 
 
-my $type = defined($options{type}) ? $options{type} : 'deb';
+my $type = $options{type} // 'deb';
 my $arch = $options{arch};
 my $arch = $options{arch};
 
 
 my @find_args;
 my @find_args;

+ 1 - 1
scripts/dpkg-shlibdeps.pl

@@ -701,7 +701,7 @@ sub extract_from_shlibs {
 	            $shlibfile, $., $_);
 	            $shlibfile, $., $_);
 	    next;
 	    next;
 	}
 	}
-	my $depread = defined($4) ? $4 : '';
+	my $depread = $4 // '';
 	if (($libname eq $2) && ($libversion eq $3)) {
 	if (($libname eq $2) && ($libversion eq $3)) {
 	    # Define dep and end here if the package type explicitly
 	    # Define dep and end here if the package type explicitly
 	    # matches. Otherwise if the packagetype is not specified, use
 	    # matches. Otherwise if the packagetype is not specified, use