DevComp/zip-rs-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add into_cow feature + removed some trivial casts

Browse source
This commit is contained in:
Mathijs van de Nes 2015-03-26 21:56:05 +01:00
parent 0f12de0388
commit 69599e1741
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib.rs
View file

@ -3,7 +3,7 @@
#![feature(unsafe_destructor)] #![feature(unsafe_destructor)]
#![warn(missing_docs)] #![warn(missing_docs)]
#![feature(core, io)] #![feature(core, io, into_cow)]
extern crate time; extern crate time;
extern crate flate2; extern crate flate2;

8
src/read.rs
View file

@ -121,7 +121,7 @@ impl<R: Read+io::Seek> ZipArchive<R>
{ {
if file_number >= self.files.len() { return Err(ZipError::FileNotFound); } if file_number >= self.files.len() { return Err(ZipError::FileNotFound); }
let ref data = self.files[file_number]; let ref data = self.files[file_number];
let pos = data.data_start as u64; let pos = data.data_start;
if data.encrypted if data.encrypted
{ {
@ -129,7 +129,7 @@ impl<R: Read+io::Seek> ZipArchive<R>
} }
try!(self.reader.seek(io::SeekFrom::Start(pos))); try!(self.reader.seek(io::SeekFrom::Start(pos)));
let limit_reader = (self.reader.by_ref() as &mut Read).take(data.compressed_size as u64); let limit_reader = (self.reader.by_ref() as &mut Read).take(data.compressed_size);
let reader = match data.compression_method let reader = match data.compression_method
{ {
@ -224,7 +224,7 @@ fn central_header_to_zip_file<R: Read+io::Seek>(reader: &mut R) -> ZipResult<Zip
let file_name_length = try!(reader.read_u16::<LittleEndian>()) as u64; let file_name_length = try!(reader.read_u16::<LittleEndian>()) as u64;
let extra_field_length = try!(reader.read_u16::<LittleEndian>()) as u64; let extra_field_length = try!(reader.read_u16::<LittleEndian>()) as u64;
let magic_and_header = 4 + 22 + 2 + 2; let magic_and_header = 4 + 22 + 2 + 2;
let data_start = offset as u64 + magic_and_header + file_name_length + extra_field_length; let data_start = offset + magic_and_header + file_name_length + extra_field_length;
// Construct the result // Construct the result
let mut result = ZipFileData let mut result = ZipFileData
@ -237,7 +237,7 @@ fn central_header_to_zip_file<R: Read+io::Seek>(reader: &mut R) -> ZipResult<Zip
uncompressed_size: uncompressed_size as u64, uncompressed_size: uncompressed_size as u64,
file_name: file_name, file_name: file_name,
file_comment: file_comment, file_comment: file_comment,
header_start: offset as u64, header_start: offset,
data_start: data_start, data_start: data_start,
}; };