From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 1/4] inboxwritable: mime_from_path: reduce `$/' scope and returns
Date: Sat, 1 Aug 2020 08:12:24 +0000 [thread overview]
Message-ID: <20200801081227.21412-2-e@yhbt.net> (raw)
In-Reply-To: <20200801081227.21412-1-e@yhbt.net>
We don't want `local $/' affecting Eml->new, and we can
use implicit returns which may be faster on older Perl.
---
lib/PublicInbox/InboxWritable.pm | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/lib/PublicInbox/InboxWritable.pm b/lib/PublicInbox/InboxWritable.pm
index 1f3f66728..e8ecd3fba 100644
--- a/lib/PublicInbox/InboxWritable.pm
+++ b/lib/PublicInbox/InboxWritable.pm
@@ -8,6 +8,7 @@ use warnings;
use base qw(PublicInbox::Inbox);
use PublicInbox::Import;
use PublicInbox::Filter::Base qw(REJECT);
+use Errno qw(ENOENT);
use constant {
PERM_UMASK => 0,
@@ -135,16 +136,11 @@ sub is_maildir_path ($) {
sub mime_from_path ($) {
my ($path) = @_;
if (open my $fh, '<', $path) {
- local $/;
- my $str = <$fh>;
- $str or return;
- return PublicInbox::Eml->new(\$str);
- } elsif ($!{ENOENT}) {
- # common with Maildir
- return;
- } else {
- warn "failed to open $path: $!\n";
- return;
+ my $str = do { local $/; <$fh> } or return;
+ PublicInbox::Eml->new(\$str);
+ } else { # ENOENT is common with Maildir
+ warn "failed to open $path: $!\n" if $! != ENOENT;
+ undef;
}
}
next prev parent reply other threads:[~2020-08-01 8:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-01 8:12 [PATCH 0/4] cleanup some minor annoyances Eric Wong
2020-08-01 8:12 ` Eric Wong [this message]
2020-08-01 8:12 ` [PATCH 2/4] inboxwritable: rename mime_from_path to eml_from_path Eric Wong
2020-08-01 8:12 ` [PATCH 3/4] searchidx: remove v1-only msg_mime sub Eric Wong
2020-08-01 8:12 ` [PATCH 4/4] remove unnecessary ->header_obj calls Eric Wong
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: https://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=20200801081227.21412-2-e@yhbt.net \
--to=e@yhbt.net \
--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).