From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 6/6] www: use autodie in more coderepo places
Date: Tue, 9 Jan 2024 11:39:28 +0000 [thread overview]
Message-ID: <20240109113928.992464-7-e@80x24.org> (raw)
In-Reply-To: <20240109113928.992464-1-e@80x24.org>
This cuts down on code somewhat (before I add more :x)
---
lib/PublicInbox/ViewVCS.pm | 11 ++++-------
lib/PublicInbox/WwwCoderepo.pm | 5 +++--
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;
prev parent reply other threads:[~2024-01-09 11:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-09 11:39 [PATCH 0/6] WWW updates Eric Wong
2024-01-09 11:39 ` [PATCH 1/6] git: workaround occasional -watch error message Eric Wong
2024-01-09 11:39 ` [PATCH 2/6] doc: txt2pre: linkify -extindex(1), dedupe -config(5) Eric Wong
2024-01-09 11:39 ` [PATCH 3/6] test_common: key2sub: don't require final ';' in scripts Eric Wong
2024-01-09 11:39 ` [PATCH 4/6] git: lowercase host in host_prefix_url Eric Wong
2024-01-09 11:39 ` [PATCH 5/6] www: linkify inbox addresses in To/Cc headers Eric Wong
2024-01-09 12:49 ` [PATCH 7/6] address: avoid [ undef, undef ] address pairs Eric Wong
2024-01-09 11:39 ` Eric Wong [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240109113928.992464-7-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).