From 18525b97f1a4b60884962d8fb326e8e85d837686 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 17 Jul 2021 09:43:33 +0200
Subject: Merging upstream version 0.21.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 archive_reader.cc | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'archive_reader.cc')

diff --git a/archive_reader.cc b/archive_reader.cc
index b7950ef..5e0862e 100644
--- a/archive_reader.cc
+++ b/archive_reader.cc
@@ -19,12 +19,7 @@
 
 #include <algorithm>
 #include <cerrno>
-#include <climits>
-#include <cstring>
-#include <string>
-#include <vector>
-#include <pthread.h>	// for tarlz.h
-#include <stdint.h>
+#include <stdint.h>	// for lzlib.h
 #include <unistd.h>
 #include <lzlib.h>
 
@@ -87,7 +82,7 @@ int Archive_reader_base::parse_records( Extended & extended,
   if( edsize <= 0 || edsize >= 1LL << 33 || bufsize >= INT_MAX )
     return 1;					// overflow or no extended data
   if( !rbuf.resize( bufsize ) ) return 1;	// extended records buffer
-  int retval = read( (uint8_t *)rbuf(), bufsize );
+  int retval = read( rbuf.u8(), bufsize );
   if( retval == 0 && !extended.parse( rbuf(), edsize, permissive ) )
     retval = 2;
   return retval;
-- 
cgit v1.2.3