From 1e62f600af782dd8616ffd97ed3c335abca25778 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 30 Mar 2022 19:53:02 +0000 Subject: [PATCH] viewdiff: use defined checks in more places It's less cognitive overhead for future readers since I just looked at it again and thought it was possible for "0" to be returned (it isn't). --- lib/PublicInbox/ViewDiff.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/PublicInbox/ViewDiff.pm b/lib/PublicInbox/ViewDiff.pm index f492b697..fb394b7c 100644 --- a/lib/PublicInbox/ViewDiff.pm +++ b/lib/PublicInbox/ViewDiff.pm @@ -83,7 +83,7 @@ sub anchor0 ($$$$) { # long filenames will require us to check in anchor1() push(@{$ctx->{-long_path}}, $fn) if $fn =~ s!\A\.\.\./?!!; - if (my $attr = to_attr($ctx->{-apfx}.$fn)) { + if (defined(my $attr = to_attr($ctx->{-apfx}.$fn))) { $ctx->{-anchors}->{$attr} = 1; my $spaces = ($orig =~ s/( +)\z//) ? $1 : ''; $$dst .= " " . @@ -97,7 +97,7 @@ sub anchor0 ($$$$) { # returns "diff --git" anchor destination, undef otherwise sub anchor1 ($$) { my ($ctx, $pb) = @_; - my $attr = to_attr($ctx->{-apfx}.$pb) or return; + my $attr = to_attr($ctx->{-apfx}.$pb) // return; my $ok = delete $ctx->{-anchors}->{$attr}; @@ -105,10 +105,10 @@ sub anchor1 ($$) { # assume diffstat and diff output follow the same order, # and ignore different ordering (could be malicious input) unless ($ok) { - my $fn = shift(@{$ctx->{-long_path}}) or return; + my $fn = shift(@{$ctx->{-long_path}}) // return; $pb =~ /\Q$fn\E\z/s or return; - $attr = to_attr($ctx->{-apfx}.$fn) or return; - $ok = delete $ctx->{-anchors}->{$attr} or return; + $attr = to_attr($ctx->{-apfx}.$fn) // return; + $ok = delete $ctx->{-anchors}->{$attr} // return; } $ok ? "diff --git" : undef } -- 2.44.0