about summary refs log tree commit homepage
diff options
context:
space:
mode:
-rw-r--r--lib/PublicInbox/Import.pm8
-rw-r--r--lib/PublicInbox/SearchIdxShard.pm2
-rw-r--r--lib/PublicInbox/V2Writable.pm2
-rwxr-xr-xscript/public-inbox-convert14
4 files changed, 13 insertions, 13 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;
diff --git a/lib/PublicInbox/SearchIdxShard.pm b/lib/PublicInbox/SearchIdxShard.pm
index e754b038..c1f52d8b 100644
--- a/lib/PublicInbox/SearchIdxShard.pm
+++ b/lib/PublicInbox/SearchIdxShard.pm
@@ -53,7 +53,7 @@ sub shard_worker_loop ($$$$$) {
         my ($self, $v2w, $r, $shard, $bnote) = @_;
         $0 = "pi-v2-shard[$shard]";
         $self->begin_txn_lazy;
-        while (my $line = $r->getline) {
+        while (my $line = readline($r)) {
                 $v2w->{current_info} = "[$shard] $line";
                 if ($line eq "commit\n") {
                         $self->commit_txn_lazy;
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index c732b98a..513e9f23 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -606,7 +606,7 @@ sub barrier_wait {
         my $bnote = $self->{bnote} or return;
         my $r = $bnote->[0];
         while (scalar keys %$barrier) {
-                defined(my $l = $r->getline) or die "EOF on barrier_wait: $!";
+                defined(my $l = readline($r)) or die "EOF on barrier_wait: $!";
                 $l =~ /\Abarrier (\d+)/ or die "bad line on barrier_wait: $l";
                 delete $barrier->{$1} or die "bad shard[$1] on barrier wait";
         }
diff --git a/script/public-inbox-convert b/script/public-inbox-convert
index 4c220b36..7fb15adf 100755
--- a/script/public-inbox-convert
+++ b/script/public-inbox-convert
@@ -111,12 +111,12 @@ while (<$rd>) {
                 $state = 'commit';
         } elsif (/^data ([0-9]+)/) {
                 my $len = $1;
-                $w->print($_) or $im->wfail;
+                print $w $_ or $im->wfail;
                 while ($len) {
                         my $n = read($rd, my $tmp, $len) or die "read: $!";
                         warn "$n != $len\n" if $n != $len;
                         $len -= $n;
-                        $w->print($tmp) or $im->wfail;
+                        print $w $tmp or $im->wfail;
                 }
                 next;
         } elsif ($state eq 'commit') {
@@ -124,9 +124,9 @@ while (<$rd>) {
                         my ($mark, $path) = ($1, $2);
                         $D{$path} = $mark;
                         if ($last && $last ne 'm') {
-                                $w->print("D $last\n") or $im->wfail;
+                                print $w "D $last\n" or $im->wfail;
                         }
-                        $w->print("M 100644 :$mark m\n") or $im->wfail;
+                        print $w "M 100644 :$mark m\n" or $im->wfail;
                         $last = 'm';
                         next;
                 }
@@ -134,15 +134,15 @@ while (<$rd>) {
                         my $mark = delete $D{$1};
                         defined $mark or die "undeleted path: $1\n";
                         if ($last && $last ne 'd') {
-                                $w->print("D $last\n") or $im->wfail;
+                                print $w "D $last\n" or $im->wfail;
                         }
-                        $w->print("M 100644 :$mark d\n") or $im->wfail;
+                        print $w "M 100644 :$mark d\n" or $im->wfail;
                         $last = 'd';
                         next;
                 }
         }
         last if $_ eq "done\n";
-        $w->print($_) or $im->wfail;
+        print $w $_ or $im->wfail;
 }
 $w = $r = undef;
 close $rd or die "close fast-export: $!\n";