tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/backup/archive_index.rs: use close() instead of flush()

Browse Source 
Also pass a reference to the encoder.
This commit is contained in:
Dietmar Maurer
2019-01-02 11:02:56 +01:00
parent 94a882e900
commit 5e7a09be0d
5 changed files with 69 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/catar/encoder.rs
View File

@ -26,18 +26,17 @@ use nix::sys::stat::FileStat;
/// maximum memory usage.
pub const MAX_DIRECTORY_ENTRIES: usize = 256*1024;
pub struct CaTarEncoder<W: Write> {
pub struct CaTarEncoder<'a, W: Write> {
current_path: PathBuf, // used for error reporting
writer: W,
writer: &'a mut W,
writer_pos: usize,
size: usize,
file_copy_buffer: Vec<u8>,
}
impl <'a, W: Write> CaTarEncoder<'a, W> {
impl <W: Write> CaTarEncoder<W> {
pub fn encode(path: PathBuf, dir: &mut nix::dir::Dir, writer: W) -> Result<(), Error> {
pub fn encode(path: PathBuf, dir: &mut nix::dir::Dir, writer: &'a mut W) -> Result<(), Error> {
const FILE_COPY_BUFFER_SIZE: usize = 1024*1024;
@ -55,8 +54,6 @@ impl <W: Write> CaTarEncoder<W> {
// todo: use scandirat??
me.encode_dir(dir)?;
me.writer.flush()?;
Ok(())
}