From d0b769c93c623d308c02cb5d86726f4c9607f5f4 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sat, 27 Jun 2015 15:11:11 -0700
Subject: Move macro replicas into C shim

---
 openssl/src/bio/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'openssl/src/bio/mod.rs')

diff --git a/openssl/src/bio/mod.rs b/openssl/src/bio/mod.rs
index e81694a4..e0a7d0c9 100644
--- a/openssl/src/bio/mod.rs
+++ b/openssl/src/bio/mod.rs
@@ -73,7 +73,7 @@ impl Read for MemBio {
 
         if ret <= 0 {
             let is_eof = unsafe { ffi::BIO_eof(self.bio) };
-            if is_eof {
+            if is_eof != 0 {
                 Ok(0)
             } else {
                 Err(io::Error::new(io::ErrorKind::Other,
-- 
cgit v1.2.3


From 0cff370f1d4e46145bc9047508a7e63402b10adc Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sat, 27 Jun 2015 21:40:00 -0700
Subject: Reduce SslStream constructor duplication

---
 openssl/src/bio/mod.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'openssl/src/bio/mod.rs')

diff --git a/openssl/src/bio/mod.rs b/openssl/src/bio/mod.rs
index e0a7d0c9..7eea16d8 100644
--- a/openssl/src/bio/mod.rs
+++ b/openssl/src/bio/mod.rs
@@ -76,8 +76,7 @@ impl Read for MemBio {
             if is_eof != 0 {
                 Ok(0)
             } else {
-                Err(io::Error::new(io::ErrorKind::Other,
-                                   SslError::get()))
+                Err(io::Error::new(io::ErrorKind::Other, SslError::get()))
             }
         } else {
             Ok(ret as usize)
@@ -93,8 +92,7 @@ impl Write for MemBio {
         };
 
         if ret < 0 {
-                Err(io::Error::new(io::ErrorKind::Other,
-                                   SslError::get()))
+            Err(io::Error::new(io::ErrorKind::Other, SslError::get()))
         } else {
             Ok(ret as usize)
         }
-- 
cgit v1.2.3