From: Don Armstrong <don@donarmstrong.com>
Date: Fri, 13 Apr 2018 17:24:40 +0000 (-0700)
Subject: use hash_slice instead of multi-line exists
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e09c4d3c9adb00e42d9af5daf9b1d5dd04264e6b;p=debbugs.git

use hash_slice instead of multi-line exists
---

diff --git a/Debbugs/CGI/Bugreport.pm b/Debbugs/CGI/Bugreport.pm
index 4a47506..a606394 100644
--- a/Debbugs/CGI/Bugreport.pm
+++ b/Debbugs/CGI/Bugreport.pm
@@ -37,7 +37,7 @@ use Digest::MD5 qw(md5_hex);
 use Debbugs::Mail qw(get_addresses :reply);
 use Debbugs::MIME qw(decode_rfc1522 create_mime_message parse_to_mime_entity);
 use Debbugs::CGI qw(:url :html :util);
-use Debbugs::Common qw(globify_scalar english_join);
+use Debbugs::Common qw(globify_scalar english_join hash_slice);
 use Debbugs::UTF8;
 use Debbugs::Config qw(:config);
 use Debbugs::Log qw(:read);
@@ -226,9 +226,7 @@ sub display_entity {
                                output => $output,
                                attachments => $attachments,
                                terse => $param{terse},
-                               exists $param{msg}?(msg=>$param{msg}):(),
-                               exists $param{att}?(att=>$param{att}):(),
-                               exists $param{avatars}?(avatars=>$param{avatars}):(),
+                               hash_slice(%param,qw(msg att avatars)),
                               );
             if ($raw_output) {
                 return $raw_output;
@@ -249,9 +247,7 @@ sub display_entity {
 			   output => $output,
 			   attachments => $attachments,
 			   terse => $param{terse},
-			   exists $param{msg}?(msg=>$param{msg}):(),
-			   exists $param{att}?(att=>$param{att}):(),
-                           exists $param{avatars}?(avatars=>$param{avatars}):(),
+                           hash_slice(%param,qw(msg att avatars)),
 			  );
 	    # print {$output} "\n";
 	}
@@ -348,10 +344,8 @@ sub handle_email_message{
                         output => $output_fh,
                         attachments => \@attachments,
                         terse       => $param{terse},
-                        exists $param{msg}?(msg=>$param{msg}):(),
-                        exists $param{att}?(att=>$param{att}):(),
-                        exists $param{trim_headers}?(trim_headers=>$param{trim_headers}):(),
-                        exists $param{avatars}?(avatars=>$param{avatars}):(),
+                        hash_slice(%param,qw(msg att trim_headers avatars),
+                                  ),
                        );
      return $raw_output?$output:decode_utf8($output);
 }
diff --git a/Debbugs/CGI/Pkgreport.pm b/Debbugs/CGI/Pkgreport.pm
index cb53f17..01e661f 100644
--- a/Debbugs/CGI/Pkgreport.pm
+++ b/Debbugs/CGI/Pkgreport.pm
@@ -99,7 +99,7 @@ sub generate_package_info{
 	     binary_to_source(source_only => 1,
 			      scalar_only => 1,
 			      binary => $package,
-			      exists $param{schema}?(schema => $param{schema}):(),
+			      hash_slice(%param,qw(schema)),
 			     );
      }
 
@@ -357,8 +357,8 @@ sub pkg_htmlizebugs {
      my $binary_to_source_cache = {};
      my $statuses =
 	 get_bug_statuses(bug => \@bugs,
-			  (map {exists $param{$_}?($_,$param{$_}):()}
-			   qw(dist version schema bugusertags)
+			  hash_slice(%param,
+			   qw(dist version schema bugusertags),
 			  ),
 			  (exists $param{arch}?(arch => $param{arch}):(arch => $config{default_architectures})),
 			  binary_to_source_cache => $binary_to_source_cache,