From 145190edbb9b031127d64671d5d8548086ce9fea Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Sat, 21 Dec 2019 08:00:00 +0000
Subject: nntp: get_range: return scalarref for $beg

...Instead of just returning a plain scalar inside an arrayref.

This is because we usually pass the result of NNTP::get_range to
Msgmap::msg_range.  Upcoming changes will move us away from
anonymous subroutines, so this change will make followup commits
easier-to-digest as modifications to the underlying scalar can
be more easily propagated between non-anonymous-subs.
---
 lib/PublicInbox/NNTP.pm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'lib/PublicInbox/NNTP.pm')

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index e41e3f64..58724938 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -194,7 +194,7 @@ sub cmd_listgroup ($;$$) {
 		return $r unless ref $r;
 		my ($beg, $end) = @$r;
 		long_response($self, sub {
-			$r = $mm->msg_range(\$beg, $end, 'num');
+			$r = $mm->msg_range($beg, $end, 'num');
 			scalar(@$r) or return;
 			more($self, join("\r\n", map { $_->[0] } @$r));
 			1;
@@ -583,7 +583,7 @@ sub get_range ($$) {
 	$beg = $min if ($beg < $min);
 	$end = $max if ($end > $max);
 	return '420 No article(s) selected' if ($beg > $end);
-	[ $beg, $end ];
+	[ \$beg, $end ];
 }
 
 sub long_response ($$) {
@@ -651,7 +651,7 @@ sub hdr_message_id ($$$) { # optimize XHDR Message-ID [range] for slrnpull.
 		my ($beg, $end) = @$r;
 		more($self, $xhdr ? r221 : r225);
 		long_response($self, sub {
-			my $r = $mm->msg_range(\$beg, $end);
+			my $r = $mm->msg_range($beg, $end);
 			@$r or return;
 			more($self, join("\r\n", map {
 				"$_->[0] <$_->[1]>"
@@ -694,7 +694,7 @@ sub hdr_xref ($$$) { # optimize XHDR Xref [range] for rtin
 		my ($beg, $end) = @$r;
 		more($self, $xhdr ? r221 : r225);
 		long_response($self, sub {
-			my $r = $mm->msg_range(\$beg, $end);
+			my $r = $mm->msg_range($beg, $end);
 			@$r or return;
 			more($self, join("\r\n", map {
 				my $num = $_->[0];
@@ -727,7 +727,7 @@ sub hdr_searchmsg ($$$$) {
 		return $r unless ref $r;
 		my ($beg, $end) = @$r;
 		more($self, $xhdr ? r221 : r225);
-		my $cur = $beg;
+		my $cur = $$beg;
 		long_response($self, sub {
 			my $msgs = $over->query_xover($cur, $end);
 			my $nr = scalar @$msgs or return;
@@ -813,9 +813,9 @@ sub cmd_xrover ($;$) {
 	more($self, '224 Overview information follows');
 
 	long_response($self, sub {
-		my $h = over_header_for($over, $beg, 'references');
-		more($self, "$beg $h") if defined($h);
-		$beg++ < $end;
+		my $h = over_header_for($over, $$beg, 'references');
+		more($self, "$$beg $h") if defined($h);
+		$$beg++ < $end;
 	});
 }
 
@@ -860,9 +860,9 @@ sub cmd_xover ($;$) {
 	my $r = get_range($self, $range);
 	return $r unless ref $r;
 	my ($beg, $end) = @$r;
-	more($self, "224 Overview information follows for $beg to $end");
+	more($self, "224 Overview information follows for $$beg to $end");
 	my $over = $self->{ng}->over;
-	my $cur = $beg;
+	my $cur = $$beg;
 	long_response($self, sub {
 		my $msgs = $over->query_xover($cur, $end);
 		my $nr = scalar @$msgs or return;
-- 
cgit v1.2.3-24-ge0c7