min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup

This commit is contained in:
Steven Fackler 2016-03-27 13:37:00 -07:00
parent c4187638a8
commit 02f114faae
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openssl/src/ssl/bio.rs
View File

@ -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 state = state::<S>(bio);
let buf = slice::from_raw_parts(buf as *const _, len as usize); let buf = slice::from_raw_parts(buf as *const _, len as usize);
let result = recover(|| state.stream.write(buf)); match recover(|| state.stream.write(buf)) {
match result {
Ok(Ok(len)) => len as c_int, Ok(Ok(len)) => len as c_int,
Ok(Err(err)) => { Ok(Err(err)) => {
if retriable_error(&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 state = state::<S>(bio);
let buf = slice::from_raw_parts_mut(buf as *mut _, len as usize); let buf = slice::from_raw_parts_mut(buf as *mut _, len as usize);
let result = recover(|| state.stream.read(buf)); match recover(|| state.stream.read(buf)) {
match result {
Ok(Ok(len)) => len as c_int, Ok(Ok(len)) => len as c_int,
Ok(Err(err)) => { Ok(Err(err)) => {
if retriable_error(&err) { if retriable_error(&err) {
@ -146,9 +142,8 @@ unsafe extern "C" fn ctrl<S: Write>(bio: *mut BIO,
-> c_long { -> c_long {
if cmd == BIO_CTRL_FLUSH { if cmd == BIO_CTRL_FLUSH {
let state = state::<S>(bio); let state = state::<S>(bio);
let result = recover(|| state.stream.flush());
match result { match recover(|| state.stream.flush()) {
Ok(Ok(())) => 1, Ok(Ok(())) => 1,
Ok(Err(err)) => { Ok(Err(err)) => {
state.error = Some(err); state.error = Some(err);