mbox: kill Bytes meta-header, too

[public-inbox.git] / lib / PublicInbox / Mbox.pm

diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index 19c18ac437449e79a206767395cfb5cd8957df64..6aa05170392cc42d841db0d026b2cc2ec189cf1d 100644 (file)
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -1,10 +1,10 @@
-# Copyright (C) 2015, all contributors <meta@public-inbox.org>
+# Copyright (C) 2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 # Streaming interface for formatting messages as an mboxrd
 package PublicInbox::Mbox;
 use strict;
 use warnings;
-use PublicInbox::MID qw/mid_compress mid2path/;
+use PublicInbox::MID qw/mid2path/;
 require Email::Simple;
 
 sub thread_mbox {
@@ -32,7 +32,7 @@ sub emit_msg {
 
        # drop potentially confusing headers, ssoma already should've dropped
        # Lines and Content-Length
-       foreach my $d (qw(Lines Content-Length Status)) {
+       foreach my $d (qw(Lines Bytes Content-Length Status)) {
                $header_obj->header_set($d);
        }
 
@@ -69,7 +69,7 @@ sub emit_mbox {
        $fh = PublicInbox::MboxGz->new($fh) if $sfx;
 
        require PublicInbox::GitCatFile;
-       my $mid = mid_compress($ctx->{mid});
+       my $mid = $ctx->{mid};
        my $git = PublicInbox::GitCatFile->new($ctx->{git_dir});
        my %opts = (offset => 0);
        my $nr;
@@ -110,16 +110,15 @@ EOF
 package PublicInbox::MboxGz;
 use strict;
 use warnings;
-use fields qw(gz fh buf);
 
 sub new {
        my ($class, $fh) = @_;
-       my $self = fields::new($class);
        my $buf;
-       $self->{buf} = \$buf;
-       $self->{gz} = IO::Compress::Gzip->new(\$buf);
-       $self->{fh} = $fh;
-       $self;
+       bless {
+               buf => \$buf,
+               gz => IO::Compress::Gzip->new(\$buf),
+               fh => $fh,
+       }, $class;
 }
 
 sub _flush_buf {