unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] viewdiff: use defined checks in more places
Date: Wed, 30 Mar 2022 19:53:02 +0000	[thread overview]
Message-ID: <20220330195302.1054-1-e@80x24.org> (raw)

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 .= " <a\nid=i$attr\nhref=#$attr>" .
@@ -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 ? "<a\nhref=#i$attr\nid=$attr>diff</a> --git" : undef
 }

                 reply	other threads:[~2022-03-30 19:53 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20220330195302.1054-1-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    --subject='Re: [PATCH] viewdiff: use defined checks in more places' \
    /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

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).