Ryan/drop
1
0
Fork 0
mirror of https://github.com/Drop-OSS/drop.git synced 2026-07-24 17:03:00 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix segmentation fault

Browse Source 
add read_block function to reader
This commit is contained in:
Jamie Winsor
2016-01-11 19:38:01 -08:00
parent a45b168b6c
commit a069bd2a98
3 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/libarchive/src/error.rs
+3 -9
View File
@@ -5,7 +5,7 @@ use archive;
pub type ArchiveResult<T> = Result<T, ArchiveError>;
#[derive(Debug)]
pub struct ErrCode(i32);
pub struct ErrCode(pub i32);
impl fmt::Display for ErrCode {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
@@ -44,20 +44,14 @@ impl fmt::Display for ArchiveError {
impl<'a> From<&'a archive::Handle> for ArchiveError {
fn from(handle: &'a archive::Handle) -> ArchiveError {
ArchiveError::Sys(ErrCode::from(handle), handle.err_msg())
}
}
impl<'a> From<&'a archive::Handle> for ErrCode {
fn from(handle: &'a archive::Handle) -> ErrCode {
ErrCode(handle.err_code())
ArchiveError::Sys(handle.err_code(), handle.err_msg())
}
}
impl<'a> From<&'a archive::Handle> for ArchiveResult<()> {
fn from(handle: &'a archive::Handle) -> ArchiveResult<()> {
match handle.err_code() {
0 => Ok(()),
ErrCode(0) => Ok(()),
_ => Err(ArchiveError::from(handle)),
}
}