aboutsummaryrefslogtreecommitdiff
path: root/openssl/src
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-03-27 13:37:00 -0700
committerSteven Fackler <[email protected]>2016-03-27 13:37:00 -0700
commit02f114faae1f829b799afccdd8b0e370923f4178 (patch)
treec64634992301903ee66681ea2becf8c0ead121b2 /openssl/src
parentUpdate for nightly changes (diff)
downloadrust-openssl-02f114faae1f829b799afccdd8b0e370923f4178.tar.xz
rust-openssl-02f114faae1f829b799afccdd8b0e370923f4178.zip
Cleanup
Diffstat (limited to 'openssl/src')
-rw-r--r--openssl/src/ssl/bio.rs11
1 files 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<S: Write>(bio: *mut BIO, buf: *const c_char, len: c_
let state = state::<S>(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<S: Read>(bio: *mut BIO, buf: *mut c_char, len: c_int)
let state = state::<S>(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<S: Write>(bio: *mut BIO,
-> c_long {
if cmd == BIO_CTRL_FLUSH {
let state = state::<S>(bio);
- let result = recover(|| state.stream.flush());
- match result {
+ match recover(|| state.stream.flush()) {
Ok(Ok(())) => 1,
Ok(Err(err)) => {
state.error = Some(err);