From c14a8838606b49fbe6aa39892701372b788d9945 Mon Sep 17 00:00:00 2001 From: bold Date: Thu, 16 Jan 2020 09:10:26 +0100 Subject: eliminate conditionals when enforce blocking in destructors --- src/sftp.rs | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/sftp.rs b/src/sftp.rs index 83fdd07..17576c3 100644 --- a/src/sftp.rs +++ b/src/sftp.rs @@ -415,13 +415,9 @@ impl Drop for Sftp { // Set ssh2 to blocking if sftp was not shutdown yet. if let Some(inner) = self.inner.take() { let was_blocking = inner.sess.is_blocking(); - if !was_blocking { - inner.sess.set_blocking(true); - } + inner.sess.set_blocking(true); assert_eq!(unsafe { raw::libssh2_sftp_shutdown(inner.raw) }, 0); - if !was_blocking { - inner.sess.set_blocking(false); - } + inner.sess.set_blocking(was_blocking); } } } @@ -618,13 +614,9 @@ impl<'sftp> Drop for File<'sftp> { // also properly poll `close` on `File` until success. if let Some(sftp) = inner.sftp.inner.as_ref() { let was_blocking = sftp.sess.is_blocking(); - if !was_blocking { - sftp.sess.set_blocking(true); - } + sftp.sess.set_blocking(true); assert_eq!(unsafe { raw::libssh2_sftp_close_handle(inner.raw) }, 0); - if !was_blocking { - sftp.sess.set_blocking(false); - } + sftp.sess.set_blocking(was_blocking); } else { assert_eq!(unsafe { raw::libssh2_sftp_close_handle(inner.raw) }, 0); } -- cgit v1.2.3