From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) 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.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 369972018B for ; Tue, 21 Jun 2016 03:12:03 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 2/7] view: remove dst parameter from thread skeleton dump Date: Tue, 21 Jun 2016 03:11:56 +0000 Message-Id: <20160621031201.28089-3-e@80x24.org> In-Reply-To: <20160621031201.28089-1-e@80x24.org> References: <20160621031201.28089-1-e@80x24.org> List-Id: We can stuff this into the state hash to reduce stack size and hopefully improve readability. --- lib/PublicInbox/View.pm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 9095c50..a1b45e9 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -384,9 +384,10 @@ sub thread_skel { prev_attr => '', prev_level => 0, upfx => "$tpfx../", + dst => $dst, }; for (thread_results(load_results($sres))->rootset) { - skel_dump($dst, $state, $_, 0); + skel_dump($state, $_, 0); } $ctx->{next_msg} = $state->{next_msg}; $ctx->{parent_msg} = $parent; @@ -664,8 +665,9 @@ sub _msg_date { sub fmt_ts { POSIX::strftime('%Y-%m-%d %k:%M', gmtime($_[0])) } sub _skel_header { - my ($dst, $state, $hdr, $level) = @_; + my ($state, $hdr, $level) = @_; + my $dst = $state->{dst}; my $cur = $state->{cur}; my $mid = mid_clean($hdr->header_raw('Message-ID')); my $f = ascii_html($hdr->header('X-PI-From')); @@ -712,14 +714,15 @@ sub _skel_header { } sub skel_dump { - my ($dst, $state, $node, $level) = @_; + my ($state, $node, $level) = @_; return unless $node; if (my $mime = $node->message) { my $hdr = $mime->header_obj; my $mid = mid_clean($hdr->header_raw('Message-ID')); - _skel_header($dst, $state, $hdr, $level); + _skel_header($state, $hdr, $level); } else { my $mid = $node->messageid; + my $dst = $state->{dst}; if ($mid eq 'subject dummy') { $$dst .= "\t[no common parent]\n"; } else { @@ -731,8 +734,8 @@ sub skel_dump { $$dst .= qq{<$html>\n}; } } - skel_dump($dst, $state, $node->child, $level+1); - skel_dump($dst, $state, $node->next, $level); + skel_dump($state, $node->child, $level+1); + skel_dump($state, $node->next, $level); } sub sort_ts {