about summary refs log tree commit homepage
path: root/lib/PublicInbox/Import.pm
diff options
context:
space:
mode:
authorEric Wong <e@yhbt.net>2020-05-17 19:48:14 +0000
committerEric Wong <e@yhbt.net>2020-05-19 07:42:48 +0000
commit7bca96023bb26438a5c9d0a7eec3986f5d66f5bf (patch)
tree4b92cc3c85faad6986a80b122bb41072a583397a /lib/PublicInbox/Import.pm
parentc43813b9138398ed2de06c3616a5932725090ae3 (diff)
downloadpublic-inbox-7bca96023bb26438a5c9d0a7eec3986f5d66f5bf.tar.gz
In our inbox-writing code paths, ->getline as an OO method may
be confused with the various definitions of `getline' used by
the PSGI interface.  It's also easier to do: "perldoc -f readline"
than to figure out which class "->getline" belongs to (IO::Handle)
and lookup documentation for that.

->print is less confusing than the "readline" vs "getline"
mismatch, but we can still make it clear we're using a real
file handle and not a mock interface.

Finally, functions are a bit faster than their OO counterparts.
Diffstat (limited to 'lib/PublicInbox/Import.pm')
-rw-r--r--lib/PublicInbox/Import.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index 792570c8..a9013504 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -160,7 +160,7 @@ sub progress {
         my ($self, $msg) = @_;
         return unless $self->{pid};
         print { $self->{out} } "progress $msg\n" or wfail;
-        $self->{in}->getline eq "progress $msg\n" or die
+        readline($self->{in}) eq "progress $msg\n" or die
                 "progress $msg not received\n";
         undef;
 }
@@ -554,7 +554,7 @@ sub replace_oids {
                         push @buf, "reset $tmp\n";
                 } elsif (/^commit (?:.+)/) {
                         if (@buf) {
-                                $w->print(@buf) or wfail;
+                                print $w @buf or wfail;
                                 @buf = ();
                         }
                         push @buf, "commit $tmp\n";
@@ -591,7 +591,7 @@ sub replace_oids {
                                 rewrite_commit($self, \@oids, \@buf, $mime);
                                 $nreplace++;
                         }
-                        $w->print(@buf, "\n") or wfail;
+                        print $w @buf, "\n" or wfail;
                         @buf = ();
                 } elsif ($_ eq "done\n") {
                         $done = 1;
@@ -604,7 +604,7 @@ sub replace_oids {
         }
         close $rd or die "close fast-export failed: $?";
         if (@buf) {
-                $w->print(@buf) or wfail;
+                print $w @buf or wfail;
         }
         die 'done\n not seen from fast-export' unless $done;
         chomp(my $cmt = $self->get_mark(":$mark")) if $nreplace;