user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
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	[thread overview]
Message-ID: <20160621031201.28089-3-e@80x24.org> (raw)
In-Reply-To: <20160621031201.28089-1-e@80x24.org>

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{&lt;<a\nhref="$href">$html</a>&gt;\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 {

  parent reply	other threads:[~2016-06-21  3:12 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-21  3:11 [PATCH 0/7] www: avoid recursion for thread walking Eric Wong
2016-06-21  3:11 ` [PATCH 1/7] view: remove upfx parameter from thread skeleton dump Eric Wong
2016-06-21  3:11 ` Eric Wong [this message]
2016-06-21  3:11 ` [PATCH 3/7] view: remove recursion " Eric Wong
2016-06-21  3:11 ` [PATCH 4/7] view: remove recursion from expanded thread view Eric Wong
2016-06-21  3:11 ` [PATCH 5/7] searchview: remove recursion from " Eric Wong
2016-06-21  3:12 ` [PATCH 6/7] view: avoid recursion in topic index Eric Wong
2016-06-21  3:12 ` [PATCH 7/7] view: common thread walking interface Eric Wong

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=20160621031201.28089-3-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

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