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/4] view: simplify message threading dumpers
Date: Thu, 20 Aug 2015 10:20:27 +0000	[thread overview]
Message-ID: <1440066029-7400-2-git-send-email-e@80x24.org> (raw)
In-Reply-To: <1440066029-7400-1-git-send-email-e@80x24.org>

---
 lib/PublicInbox/View.pm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index e29922e..fe701b1 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -498,6 +498,7 @@ sub anchor_for {
 
 sub simple_dump {
 	my ($dst, $root, $node, $level) = @_;
+	return unless $node;
 	# $root = [ Root Message-ID, \%seen, $srch ];
 	if (my $x = $node->message) {
 		my $mid = $x->header('Message-ID');
@@ -527,8 +528,8 @@ sub simple_dump {
 			}
 		}
 	}
-	simple_dump($dst, $root, $node->child, $level + 1) if $node->child;
-	simple_dump($dst, $root, $node->next, $level) if $node->next;
+	simple_dump($dst, $root, $node->child, $level+1);
+	simple_dump($dst, $root, $node->next, $level);
 }
 
 sub thread_followups {
@@ -553,6 +554,7 @@ sub thread_html_head {
 
 sub thread_entry {
 	my ($dst, $git, $state, $node, $level) = @_;
+	return unless $node;
 	# $state = [ $search_res, $seen, undef, 0 (msg_nr) ];
 	# $seen is overloaded with 3 types of fields:
 	#	1) "root_anchor" => anchor_for(Message-ID),
@@ -570,11 +572,8 @@ sub thread_entry {
 			$$dst .= index_entry(undef, $mime, $level, $state);
 		}
 	}
-	my $cur;
-	$cur = $node->child and
-		thread_entry($dst, $git, $state, $cur, $level + 1);
-	$cur = $node->next and
-		thread_entry($dst, $git, $state, $cur, $level);
+	thread_entry($dst, $git, $state, $node->child, $level + 1);
+	thread_entry($dst, $git, $state, $node->next, $level);
 }
 
 sub load_results {
-- 
EW


  reply	other threads:[~2015-08-20 10:20 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-20 10:20 [PATCH 1/4] dead code cleanup Eric Wong
2015-08-20 10:20 ` Eric Wong [this message]
2015-08-20 10:20 ` [PATCH 3/4] avoid using header_raw for Message-ID retrieval Eric Wong
2015-08-20 10:20 ` [PATCH 4/4] search: preserve References: order in document data 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=1440066029-7400-2-git-send-email-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).