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

backup: use new proxmox::tools::io traits

Browse Source 
This replaces all `write_value` calls with `write_le_value`
calls!

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-07-01 10:36:59 +02:00
parent dc9775d1b0
commit 5485b579a1
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/backup/data_blob.rs
View File

@ -1,8 +1,7 @@
use failure::*; use failure::*;
use std::convert::TryInto; use std::convert::TryInto;
use proxmox::tools::io::ops::ReadExtOps; use proxmox::tools::io::{ReadExt, WriteExt};
use crate::tools::write::WriteUtilOps;
use super::*; use super::*;
@ -96,7 +95,9 @@ impl DataBlob {
iv: [0u8; 16], iv: [0u8; 16],
tag: [0u8; 16], tag: [0u8; 16],
}; };
raw_data.write_value(&dummy_head)?; unsafe {
raw_data.write_le_value(dummy_head)?;
}
let (iv, tag) = config.encrypt_to(data, &mut raw_data)?; let (iv, tag) = config.encrypt_to(data, &mut raw_data)?;
@ -104,7 +105,9 @@ impl DataBlob {
head: DataBlobHeader { magic, crc: [0; 4] }, iv, tag, head: DataBlobHeader { magic, crc: [0; 4] }, iv, tag,
}; };
(&mut raw_data[0..header_len]).write_value(&head)?; unsafe {
(&mut raw_data[0..header_len]).write_le_value(head)?;
}
return Ok(DataBlob { raw_data }); return Ok(DataBlob { raw_data });
} else { } else {
@ -117,7 +120,9 @@ impl DataBlob {
magic: COMPRESSED_BLOB_MAGIC_1_0, magic: COMPRESSED_BLOB_MAGIC_1_0,
crc: [0; 4], crc: [0; 4],
}; };
comp_data.write_value(&head)?; unsafe {
comp_data.write_le_value(head)?;
}
zstd::stream::copy_encode(data, &mut comp_data, 1)?; zstd::stream::copy_encode(data, &mut comp_data, 1)?;
@ -132,7 +137,9 @@ impl DataBlob {
magic: UNCOMPRESSED_BLOB_MAGIC_1_0, magic: UNCOMPRESSED_BLOB_MAGIC_1_0,
crc: [0; 4], crc: [0; 4],
}; };
raw_data.write_value(&head)?; unsafe {
raw_data.write_le_value(head)?;
}
raw_data.extend_from_slice(data); raw_data.extend_from_slice(data);
return Ok(DataBlob { raw_data }); return Ok(DataBlob { raw_data });

19
src/backup/data_chunk.rs
View File

@ -1,7 +1,6 @@
use failure::*; use failure::*;
use std::convert::TryInto; use std::convert::TryInto;
use proxmox::tools::io::ops::ReadExtOps; use proxmox::tools::io::{ReadExt, WriteExt};
use crate::tools::write::WriteUtilOps;
use super::*; use super::*;
@ -100,7 +99,9 @@ impl DataChunk {
iv: [0u8; 16], iv: [0u8; 16],
tag: [0u8; 16], tag: [0u8; 16],
}; };
raw_data.write_value(&dummy_head)?; unsafe {
raw_data.write_le_value(dummy_head)?;
}
let (iv, tag) = config.encrypt_to(data, &mut raw_data)?; let (iv, tag) = config.encrypt_to(data, &mut raw_data)?;
@ -108,7 +109,9 @@ impl DataChunk {
head: DataChunkHeader { magic, crc: [0; 4] }, iv, tag, head: DataChunkHeader { magic, crc: [0; 4] }, iv, tag,
}; };
(&mut raw_data[0..header_len]).write_value(&head)?; unsafe {
(&mut raw_data[0..header_len]).write_le_value(head)?;
}
return Ok(DataChunk { digest, raw_data }); return Ok(DataChunk { digest, raw_data });
} else { } else {
@ -121,7 +124,9 @@ impl DataChunk {
magic: COMPRESSED_CHUNK_MAGIC_1_0, magic: COMPRESSED_CHUNK_MAGIC_1_0,
crc: [0; 4], crc: [0; 4],
}; };
comp_data.write_value(&head)?; unsafe {
comp_data.write_le_value(head)?;
}
zstd::stream::copy_encode(data, &mut comp_data, 1)?; zstd::stream::copy_encode(data, &mut comp_data, 1)?;
@ -137,7 +142,9 @@ impl DataChunk {
magic: UNCOMPRESSED_CHUNK_MAGIC_1_0, magic: UNCOMPRESSED_CHUNK_MAGIC_1_0,
crc: [0; 4], crc: [0; 4],
}; };
raw_data.write_value(&head)?; unsafe {
raw_data.write_le_value(head)?;
}
raw_data.extend_from_slice(data); raw_data.extend_from_slice(data);
let chunk = DataChunk { digest, raw_data }; let chunk = DataChunk { digest, raw_data };