X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMbox.pm;h=c14037f4a365d31807ce730277da44ae05eb1952;hb=007cb8774e7013e2aaca32003bbd1653e3d8582f;hp=79e09a70f575a576d6f75df176efa627d15431cd;hpb=26895bbd94dc93b76274652f9ea35626fd63a5fa;p=public-inbox.git

diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index 79e09a70..c14037f4 100644
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -26,13 +26,6 @@ sub subject_fn ($) {
 	$fn eq '' ? 'no-subject' : $fn;
 }
 
-sub smsg_for ($$$) {
-	my ($head, $db, $mid) = @_;
-	my $doc_id = $head->get_docid;
-	my $doc = $db->get_document($doc_id);
-	PublicInbox::SearchMsg->wrap($doc, $mid)->load_expand;
-}
-
 sub mb_stream {
 	my ($more) = @_;
 	bless $more, 'PublicInbox::Mbox';
@@ -47,7 +40,7 @@ sub getline {
 		return msg_str($ctx, $cur);
 	}
 	for (; !defined($cur) && $head != $tail; $head++) {
-		my $smsg = smsg_for($head, $db, $ctx->{mid});
+		my $smsg = PublicInbox::SearchMsg->get($head, $db, $ctx->{mid});
 		next if $smsg->type ne 'mail';
 		my $mref = $ctx->{-inbox}->msg_by_smsg($smsg) or next;
 		$cur = Email::Simple->new($mref);
@@ -71,7 +64,8 @@ sub emit_raw {
 		$srch->retry_reopen(sub {
 			($head, $tail, $db) = $srch->each_smsg_by_mid($mid);
 			for (; !defined($first) && $head != $tail; $head++) {
-				my $smsg = smsg_for($head, $db, $mid);
+				my @args = ($head, $db, $mid);
+				my $smsg = PublicInbox::SearchMsg->get(@args);
 				next if $smsg->type ne 'mail';
 				my $mref = $ibx->msg_by_smsg($smsg) or next;
 				$first = Email::Simple->new($mref);