1 files changed, 9 insertions, 11 deletions
diff --git a/lib/PublicInbox/IdxStack.pm b/lib/PublicInbox/IdxStack.pm
index 54d480bd..7681ee6f 100644
--- a/lib/PublicInbox/IdxStack.pm
+++ b/lib/PublicInbox/IdxStack.pm
@@ -1,16 +1,18 @@
-# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
  # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
  
  # temporary stack for public-inbox-index
+# FIXME: needs to support multi-hash in the same repo once git itself can
  package PublicInbox::IdxStack;
-use v5.10.1;
-use strict;
+use v5.12;
  use Fcntl qw(:seek);
  use constant PACK_FMT => eval { pack('Q', 1) } ? 'A1QQH*H*' : 'A1IIH*H*';
+use autodie qw(open seek);
+use PublicInbox::IO qw(read_all);
  
  # start off in write-only mode
  sub new {
-        open(my $io, '+>', undef) or die "open: $!";
+        open(my $io, '+>', undef);
          # latest_cmt is still useful when the newest revision is a `d'(elete),
          # otherwise we favor $sync->{latest_cmt} for checkpoints and {quit}
          bless { wr => $io, latest_cmt => $_[1] }, __PACKAGE__
@@ -27,7 +29,7 @@ sub push_rec {
                  $self->{rec_size} = length($rec);
                  $self->{unpack_fmt} = $fmt;
          };
-        print { $self->{wr} } $rec or die "print: $!";
+        print { $self->{wr} } $rec;
          $self->{tot_size} += length($rec);
  }
  
@@ -49,12 +51,8 @@ sub pop_rec {
          my $sz = $self->{rec_size} or return;
          my $rec_pos = $self->{tot_size} -= $sz;
          return if $rec_pos < 0;
-        my $io = $self->{rd};
-        seek($io, $rec_pos, SEEK_SET) or die "seek: $!";
-        my $r = read($io, my $buf, $sz);
-        defined($r) or die "read: $!";
-        $r == $sz or die "read($r != $sz)";
-        unpack($self->{unpack_fmt}, $buf);
+        seek($self->{rd}, $rec_pos, SEEK_SET);
+        unpack($self->{unpack_fmt}, read_all($self->{rd}, $sz));
  }
  
  1;