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

Rename by_name_internal to by_name_with_optional_password and by_index_internal to by_index_with_optional_password

Browse source
This commit is contained in:
Benjamin Richner 2020-06-23 21:17:52 +02:00
parent 07caeca6ea
commit fb4f3c5c21
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/read.rs
View file

@ -350,15 +350,15 @@ impl<R: Read + io::Seek> ZipArchive<R> {
name: &str, name: &str,
password: &[u8], password: &[u8],
) -> ZipResult<ZipFile<'a>> { ) -> ZipResult<ZipFile<'a>> {
self.by_name_internal(name, Some(password)) self.by_name_with_optional_password(name, Some(password))
} }
/// Search for a file entry by name /// Search for a file entry by name
pub fn by_name<'a>(&'a mut self, name: &str) -> ZipResult<ZipFile<'a>> { pub fn by_name<'a>(&'a mut self, name: &str) -> ZipResult<ZipFile<'a>> {
self.by_name_internal(name, None) self.by_name_with_optional_password(name, None)
} }
fn by_name_internal<'a>( fn by_name_with_optional_password<'a>(
&'a mut self, &'a mut self,
name: &str, name: &str,
password: Option<&[u8]>, password: Option<&[u8]>,
@ -369,7 +369,7 @@ impl<R: Read + io::Seek> ZipArchive<R> {
return Err(ZipError::FileNotFound); return Err(ZipError::FileNotFound);
} }
}; };
self.by_index_internal(index, password) self.by_index_with_optional_password(index, password)
} }
/// Get a contained file by index, decrypt with given password /// Get a contained file by index, decrypt with given password
@ -378,15 +378,15 @@ impl<R: Read + io::Seek> ZipArchive<R> {
file_number: usize, file_number: usize,
password: &[u8], password: &[u8],
) -> ZipResult<ZipFile<'a>> { ) -> ZipResult<ZipFile<'a>> {
self.by_index_internal(file_number, Some(password)) self.by_index_with_optional_password(file_number, Some(password))
} }
/// Get a contained file by index /// Get a contained file by index
pub fn by_index<'a>(&'a mut self, file_number: usize) -> ZipResult<ZipFile<'a>> { pub fn by_index<'a>(&'a mut self, file_number: usize) -> ZipResult<ZipFile<'a>> {
self.by_index_internal(file_number, None) self.by_index_with_optional_password(file_number, None)
} }
fn by_index_internal<'a>( fn by_index_with_optional_password<'a>(
&'a mut self, &'a mut self,
file_number: usize, file_number: usize,
mut password: Option<&[u8]>, mut password: Option<&[u8]>,