From 02f114faae1f829b799afccdd8b0e370923f4178 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sun, 27 Mar 2016 13:37:00 -0700 Subject: [PATCH] Cleanup --- openssl/src/ssl/bio.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/openssl/src/ssl/bio.rs b/openssl/src/ssl/bio.rs index 26c23d4c..5accb3e5 100644 --- a/openssl/src/ssl/bio.rs +++ b/openssl/src/ssl/bio.rs @@ -86,9 +86,7 @@ unsafe extern "C" fn bwrite(bio: *mut BIO, buf: *const c_char, len: c_ let state = state::(bio); let buf = slice::from_raw_parts(buf as *const _, len as usize); - let result = recover(|| state.stream.write(buf)); - - match result { + match recover(|| state.stream.write(buf)) { Ok(Ok(len)) => len as c_int, Ok(Err(err)) => { if retriable_error(&err) { @@ -110,9 +108,7 @@ unsafe extern "C" fn bread(bio: *mut BIO, buf: *mut c_char, len: c_int) let state = state::(bio); let buf = slice::from_raw_parts_mut(buf as *mut _, len as usize); - let result = recover(|| state.stream.read(buf)); - - match result { + match recover(|| state.stream.read(buf)) { Ok(Ok(len)) => len as c_int, Ok(Err(err)) => { if retriable_error(&err) { @@ -146,9 +142,8 @@ unsafe extern "C" fn ctrl(bio: *mut BIO, -> c_long { if cmd == BIO_CTRL_FLUSH { let state = state::(bio); - let result = recover(|| state.stream.flush()); - match result { + match recover(|| state.stream.flush()) { Ok(Ok(())) => 1, Ok(Err(err)) => { state.error = Some(err);