viewdiff: reduce sub parameter count

We're slowly moving towards doing all of our output buffering
into a single buffer, so passing that around on the stack as
a dedicated parameter is confusing.

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index f0584cb7f0ee0211f538e4aca55ee9ac328273b9..12ef643110348e779da226801ed420868993e351 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -589,7 +589,7 @@ sub add_text_body { # callback for msg_iter
                if ($cur =~ /\A>/) {
                        flush_quote($rv, $l, \$cur);
                } elsif ($diff) {
-                       flush_diff($rv, $ctx, \$cur);
+                       flush_diff($ctx, \$cur);
                } else {
                        # regular lines, OK
                        $$rv .= $l->to_html($cur);

diff --git a/lib/PublicInbox/ViewDiff.pm b/lib/PublicInbox/ViewDiff.pm
index 5d391a13e0e0b869cac074761e7f716207b643cc..f7422712aa4516818a22183a0630f729bb1b2f0a 100644 (file)
--- a/lib/PublicInbox/ViewDiff.pm
+++ b/lib/PublicInbox/ViewDiff.pm
@@ -120,8 +120,8 @@ sub anchor1 ($$) {
        $ok ? "<a\nhref=#i$attr\nid=$attr>diff</a> --git" : undef
 }
 
-sub diff_header ($$$$) {
-       my ($dst, $x, $ctx, $top) = @_;
+sub diff_header ($$$) {
+       my ($x, $ctx, $top) = @_;
        my (undef, undef, $pa, $pb) = splice(@$top, 0, 4); # ignore oid_{a,b}
        my $spfx = $ctx->{-spfx};
        my $dctx = { spfx => $spfx };
@@ -159,15 +159,17 @@ sub diff_header ($$$$) {
                warn "BUG? <$$x> had no ^index line";
        }
        $$x =~ s!^diff --git!anchor1($ctx, $pb) // 'diff --git'!ems;
+       my $dst = $ctx->{obuf};
        $$dst .= qq(<span\nclass="head">);
        $$dst .= $$x;
        $$dst .= '</span>';
        $dctx;
 }
 
-sub diff_before_or_after ($$$) {
-       my ($dst, $ctx, $x) = @_;
+sub diff_before_or_after ($$) {
+       my ($ctx, $x) = @_;
        my $linkify = $ctx->{-linkify};
+       my $dst = $ctx->{obuf};
        for my $y (split(/(^---\n)/sm, $$x)) {
                if ($y =~ /\A---\n\z/s) {
                        $$dst .= "---\n"; # all HTML is "\r\n" => "\n"
@@ -186,20 +188,21 @@ sub diff_before_or_after ($$$) {
 }
 
 # callers must do CRLF => LF conversion before calling this
-sub flush_diff ($$$) {
-       my ($dst, $ctx, $cur) = @_;
+sub flush_diff ($$) {
+       my ($ctx, $cur) = @_;
 
        my @top = split($EXTRACT_DIFFS, $$cur);
        $$cur = undef;
 
        my $linkify = $ctx->{-linkify};
+       my $dst = $ctx->{obuf};
        my $dctx; # {}, keys: Q, oid_a, oid_b
 
        while (defined(my $x = shift @top)) {
                if (scalar(@top) >= 4 &&
                                $top[1] =~ $IS_OID &&
                                $top[0] =~ $IS_OID) {
-                       $dctx = diff_header($dst, \$x, $ctx, \@top);
+                       $dctx = diff_header(\$x, $ctx, \@top);
                } elsif ($dctx) {
                        my $after = '';
 
@@ -238,9 +241,9 @@ sub flush_diff ($$$) {
                                        $$dst .= $linkify->to_html($s);
                                }
                        }
-                       diff_before_or_after($dst, $ctx, \$after) unless $dctx;
+                       diff_before_or_after($ctx, \$after) unless $dctx;
                } else {
-                       diff_before_or_after($dst, $ctx, \$x);
+                       diff_before_or_after($ctx, \$x);
                }
        }
 }