about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2024-01-09 11:39:28 +0000
committerEric Wong <e@80x24.org>2024-01-10 10:27:03 +0000
commit57b691c79fa97118e963043a0cd1530ec8ddf916 (patch)
treeb127b9abee0e5af5d712e8293ea925e3ec39f7fb
parent61c44bbd8e57c719a1a4de75a1a11c412173e820 (diff)
downloadpublic-inbox-57b691c79fa97118e963043a0cd1530ec8ddf916.tar.gz
This cuts down on code somewhat (before I add more :x)
-rw-r--r--lib/PublicInbox/ViewVCS.pm11
-rw-r--r--lib/PublicInbox/WwwCoderepo.pm5
2 files changed, 7 insertions, 9 deletions
diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index be062f36..3d835289 100644
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -28,6 +28,7 @@ use PublicInbox::Eml;
 use Text::Wrap qw(wrap);
 use PublicInbox::Hval qw(ascii_html to_filename prurl utf8_maybe);
 use POSIX qw(strftime);
+use autodie qw(open);
 my $hl = eval {
         require PublicInbox::HlMod;
         PublicInbox::HlMod->new;
@@ -154,8 +155,7 @@ sub show_commit_start { # ->psgi_qx callback
         }
         my $patchid = (split(/ /, $$bref))[0]; # ignore commit
         $ctx->{-q_value_html} = "patchid:$patchid" if defined $patchid;
-        open my $fh, '<', "$ctx->{-tmp}/h" or
-                die "open $ctx->{-tmp}/h: $!";
+        open my $fh, '<', "$ctx->{-tmp}/h";
         chop(my $buf = do { local $/ = "\0"; <$fh> });
         utf8_maybe($buf); # non-UTF-8 commits exist
         chomp $buf;
@@ -244,7 +244,7 @@ committer $co
 EOM
         print $zfh "\n", $ctx->{-linkify}->to_html($bdy) if length($bdy);
         $bdy = '';
-        open my $fh, '<', "$ctx->{-tmp}/p" or die "open $ctx->{-tmp}/p: $!";
+        open my $fh, '<', "$ctx->{-tmp}/p";
         if (-s $fh > $MAX_SIZE) {
                 print $zfh "---\n patch is too large to show\n";
         } else { # prepare flush_diff:
@@ -599,10 +599,7 @@ sub show ($$;$) {
         }
         $ctx->{fn} = $fn;
         $ctx->{-tmp} = File::Temp->newdir("solver.$oid_b-XXXX", TMPDIR => 1);
-        unless ($ctx->{lh}) {
-                open $ctx->{lh}, '+>>', "$ctx->{-tmp}/solve.log" or
-                        die "open: $!";
-        }
+        $ctx->{lh} or open $ctx->{lh}, '+>>', "$ctx->{-tmp}/solve.log";
         my $solver = PublicInbox::SolverGit->new($ctx->{ibx},
                                                 \&solve_result, $ctx);
         $solver->{gits} //= [ $ctx->{git} ];
diff --git a/lib/PublicInbox/WwwCoderepo.pm b/lib/PublicInbox/WwwCoderepo.pm
index 3814f719..4ab9a77c 100644
--- a/lib/PublicInbox/WwwCoderepo.pm
+++ b/lib/PublicInbox/WwwCoderepo.pm
@@ -23,6 +23,7 @@ use PublicInbox::RepoList;
 use PublicInbox::OnDestroy;
 use URI::Escape qw(uri_escape_utf8);
 use File::Spec;
+use autodie qw(fcntl open);
 
 my @EACH_REF = (qw(git for-each-ref --sort=-creatordate),
                 "--format=%(HEAD)%00".join('%00', map { "%($_)" }
@@ -81,11 +82,11 @@ sub new {
         $self->{$_} = 10 for qw(summary_log);
 
         # try reuse STDIN if it's already /dev/null
-        open $self->{log_fh}, '+>', '/dev/null' or die "open: $!";
+        open $self->{log_fh}, '+>', '/dev/null';
         my @l = stat($self->{log_fh}) or die "stat: $!";
         my @s = stat(STDIN) or die "stat(STDIN): $!";
         if ("@l[0, 1]" eq "@s[0, 1]") {
-                my $f = fcntl(STDIN, F_GETFL, 0) // die "F_GETFL: $!";
+                my $f = fcntl(STDIN, F_GETFL, 0);
                 $self->{log_fh} = *STDIN{IO} if $f & O_RDWR;
         }
         $self;