From: Eric Wong <e@80x24.org>
Date: Sat, 3 Apr 2021 02:24:25 +0000 (+0000)
Subject: lei_auth: rename {net_merge} to {net_merge_continue}
X-Git-Tag: v1.7.0~835
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=b0bc7e5a4fa2090b2f2c489d9d05ae6420e92d29;p=public-inbox.git

lei_auth: rename {net_merge} to {net_merge_continue}

No reason for the hash key to differ from the subroutine
name, here.
---

diff --git a/lib/PublicInbox/LeiAuth.pm b/lib/PublicInbox/LeiAuth.pm
index 48deca93..e7b26c5f 100644
--- a/lib/PublicInbox/LeiAuth.pm
+++ b/lib/PublicInbox/LeiAuth.pm
@@ -16,8 +16,8 @@ sub do_auth_atfork { # used by IPC WQ workers
 	eval {
 		my $mics = $net->imap_common_init($lei);
 		my $nn = $net->nntp_common_init($lei);
-		pkt_do($lei->{pkt_op_p}, 'net_merge', $net) or
-				die "pkt_do net_merge: $!";
+		pkt_do($lei->{pkt_op_p}, 'net_merge_continue', $net) or
+				die "pkt_do net_merge_continue: $!";
 		$net->{mics_cached} = $mics if $mics;
 		$net->{nn_cached} = $nn if $nn;
 	};
@@ -46,7 +46,7 @@ sub net_merge_continue {
 
 sub op_merge { # prepares PktOp->pair ops
 	my ($self, $ops, $wq) = @_;
-	$ops->{net_merge} = [ \&net_merge_continue, $wq ];
+	$ops->{net_merge_continue} = [ \&net_merge_continue, $wq ];
 	$ops->{net_merge_done1} = [ \&net_merge_done1, $wq ];
 }