diff options
author | Eric Wong <e@yhbt.net> | 2020-07-07 20:37:35 +0000 |
---|---|---|
committer | Eric Wong <e@yhbt.net> | 2020-07-10 11:27:06 +0000 |
commit | 7f454bace0442cd5ce22068ec1e098e964d82778 (patch) | |
tree | 1a3ba0012aa75a3a8a427a275c2b46ffce60813b /lib/PublicInbox | |
parent | bc18c05b1681acc9a468b298c34b12ca4db3e5bb (diff) | |
download | public-inbox-7f454bace0442cd5ce22068ec1e098e964d82778.tar.gz |
Returning an empty string for a filename makes no sense, so instead return `undef' so the caller can setup a fallback using the "//" operator. This fixes uninitialized variable warnings because split() on an empty string returns `undef', which caused to_filename to warn on s// and tr// ops.
Diffstat (limited to 'lib/PublicInbox')
-rw-r--r-- | lib/PublicInbox/Hval.pm | 4 | ||||
-rw-r--r-- | lib/PublicInbox/Mbox.pm | 4 | ||||
-rw-r--r-- | lib/PublicInbox/MboxGz.pm | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm index 46a83916..e21a64a6 100644 --- a/lib/PublicInbox/Hval.pm +++ b/lib/PublicInbox/Hval.pm @@ -94,12 +94,12 @@ sub obfuscate_addrs ($$;$) { # like format_sanitized_subject in git.git pretty.c with '%f' format string sub to_filename ($) { - my ($s, undef) = split(/\n/, $_[0]); + my $s = (split(/\n/, $_[0]))[0] // return; # empty string => undef $s =~ s/[^A-Za-z0-9_\.]+/-/g; $s =~ tr/././s; $s =~ s/[\.\-]+\z//; $s =~ s/\A[\.\-]+//; - $s + $s eq '' ? undef : $s; } # convert a filename (or any string) to HTML attribute diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm index 8726b9f6..115321c6 100644 --- a/lib/PublicInbox/Mbox.pm +++ b/lib/PublicInbox/Mbox.pm @@ -52,9 +52,9 @@ sub async_eml { # ->{async_eml} for async_blob_cb sub res_hdr ($$) { my ($ctx, $subject) = @_; - my $fn = $subject // 'no-subject'; + my $fn = $subject // ''; $fn =~ s/^re:\s+//i; - $fn = $fn eq '' ? 'no-subject' : to_filename($fn); + $fn = to_filename($fn) // 'no-subject'; my @hdr = ('Content-Type'); if ($ctx->{-inbox}->{obfuscate}) { # obfuscation is stupid, but maybe scrapers are, too... diff --git a/lib/PublicInbox/MboxGz.pm b/lib/PublicInbox/MboxGz.pm index fdd16f68..967af9c6 100644 --- a/lib/PublicInbox/MboxGz.pm +++ b/lib/PublicInbox/MboxGz.pm @@ -24,8 +24,7 @@ sub mbox_gz { $self->{cb} = $cb; $self->{base_url} = $self->{-inbox}->base_url($self->{env}); $self->{gz} = PublicInbox::GzipFilter::gzip_or_die(); - $fn = to_filename($fn // 'no-subject'); - $fn = 'no-subject' if $fn eq ''; + $fn = to_filename($fn // '') // 'no-subject'; # http://www.iana.org/assignments/media-types/application/gzip bless $self, __PACKAGE__; my $res_hdr = [ 'Content-Type' => 'application/gzip', |