From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <e@80x24.org>
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN:  
X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00
	shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2
Received: from localhost (dcvr.yhbt.net [127.0.0.1])
	by dcvr.yhbt.net (Postfix) with ESMTP id 6B7231FB9D
	for <meta@public-inbox.org>; Wed, 25 Dec 2019 07:51:08 +0000 (UTC)
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 19/30] view: avoid anon sub in stream_thread
Date: Wed, 25 Dec 2019 07:50:53 +0000
Message-Id: <20191225075104.22184-20-e@80x24.org>
In-Reply-To: <20191225075104.22184-1-e@80x24.org>
References: <20191225075104.22184-1-e@80x24.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
List-Id: <meta.public-inbox.org>

WwwStream already passes the WWW $ctx to the callback sub, so we
don't need to create a new sub every call to capture local variables
for the callback.
---
 lib/PublicInbox/View.pm | 42 ++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 0b102638..1ce6ba85 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -397,12 +397,29 @@ sub thread_index_entry {
 	$beg . '<pre>' . index_entry($smsg, $ctx, 0) . '</pre>' . $end;
 }
 
+sub stream_thread_i { # PublicInbox::WwwStream::getline callback
+	my ($nr, $ctx) = @_;
+	return unless exists($ctx->{dst});
+	my $q = $ctx->{-queue};
+	while (@$q) {
+		my $level = shift @$q;
+		my $node = shift @$q or next;
+		my $cl = $level + 1;
+		unshift @$q, map { ($cl, $_) } @{$node->{children}};
+		if (my $smsg = $ctx->{-inbox}->smsg_mime($node->{smsg})) {
+			return thread_index_entry($ctx, $level, $smsg);
+		} else {
+			return ghost_index_entry($ctx, $level, $node);
+		}
+	}
+	join('', thread_adj_level($ctx, 0)) . ${delete $ctx->{dst}}; # skel
+}
+
 sub stream_thread ($$) {
 	my ($rootset, $ctx) = @_;
 	my $ibx = $ctx->{-inbox};
 	my @q = map { (0, $_) } @$rootset;
-	my $level;
-	my $smsg;
+	my ($smsg, $level);
 	while (@q) {
 		$level = shift @q;
 		my $node = shift @q or next;
@@ -415,25 +432,8 @@ sub stream_thread ($$) {
 	$ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
 	$ctx->{-title_html} = ascii_html($smsg->subject);
 	$ctx->{-html_tip} = thread_index_entry($ctx, $level, $smsg);
-	$smsg = undef;
-	PublicInbox::WwwStream->response($ctx, 200, sub {
-		return unless $ctx;
-		while (@q) {
-			$level = shift @q;
-			my $node = shift @q or next;
-			my $cl = $level + 1;
-			unshift @q, map { ($cl, $_) } @{$node->{children}};
-			if ($smsg = $ibx->smsg_mime($node->{smsg})) {
-				return thread_index_entry($ctx, $level, $smsg);
-			} else {
-				return ghost_index_entry($ctx, $level, $node);
-			}
-		}
-		my $ret = join('', thread_adj_level($ctx, 0));
-		$ret .= ${$ctx->{dst}}; # skel
-		$ctx = undef;
-		$ret;
-	});
+	$ctx->{-queue} = \@q;
+	PublicInbox::WwwStream->response($ctx, 200, \&stream_thread_i);
 }
 
 sub thread_html {