Refactor/cleanup read error handling

mtodd · mtodd · commit 94e77aa96cdb · 2014-10-15T17:31:25.000-07:00
diff --git a/lib/net/ldap/connection.rb b/lib/net/ldap/connection.rb
@@ -192,7 +192,8 @@ def bind_simple(auth)
     request_pkt = [msgid, request].to_ber_sequence
     write request_pkt
 
-    (pdu = read) or raise Net::LDAP::LdapError, "no bind result"
+    pdu = read
+    raise Net::LDAP::LdapError, "no bind result" unless pdu
 
     pdu
   end
@@ -231,7 +232,9 @@ def bind_sasl(auth)
       request_pkt = [msgid, request].to_ber_sequence
       write request_pkt
 
-      (pdu = read) or raise Net::LDAP::LdapError, "no bind result"
+      pdu = read
+      raise Net::LDAP::LdapError, "no bind result" unless pdu
+
       return pdu unless pdu.result_code == 14 # saslBindInProgress
       raise Net::LDAP::LdapError, "sasl-challenge overflow" if ((n += 1) > MaxSaslChallenges)
 
@@ -409,7 +412,7 @@ def search(args = {})
         result_pdu = nil
         controls = []
 
-        while (pdu = read)
+        while pdu = read
           case pdu.app_tag
           when Net::LDAP::PDU::SearchReturnedData
             n_results += 1
@@ -515,7 +518,11 @@ def modify(args)
     pkt = [ next_msgid.to_ber, request ].to_ber_sequence
     write pkt
 
-    (pdu = read) && (pdu.app_tag == Net::LDAP::PDU::ModifyResponse) or raise Net::LDAP::LdapError, "response missing or invalid"
+    pdu = read
+
+    if !pdu || pdu.app_tag != Net::LDAP::PDU::ModifyResponse
+      raise Net::LDAP::LdapError, "response missing or invalid"
+    end
 
     pdu
   end
@@ -538,9 +545,11 @@ def add(args)
     pkt = [next_msgid.to_ber, request].to_ber_sequence
     write pkt
 
-    (pdu = read) &&
-      (pdu.app_tag == Net::LDAP::PDU::AddResponse) or
+    pdu = read
+
+    if !pdu || pdu.app_tag != Net::LDAP::PDU::AddResponse
       raise Net::LDAP::LdapError, "response missing or invalid"
+    end
 
     pdu
   end
@@ -560,9 +569,11 @@ def rename(args)
     pkt = [next_msgid.to_ber, request.to_ber_appsequence(12)].to_ber_sequence
     write pkt
 
-    (pdu = read) &&
-    (pdu.app_tag == Net::LDAP::PDU::ModifyRDNResponse) or
-    raise Net::LDAP::LdapError.new( "response missing or invalid" )
+    pdu = read
+
+    if !pdu || pdu.app_tag != Net::LDAP::PDU::ModifyRDNResponse
+      raise Net::LDAP::LdapError.new "response missing or invalid"
+    end
 
     pdu
   end
@@ -577,7 +588,11 @@ def delete(args)
     pkt = [next_msgid.to_ber, request, controls].compact.to_ber_sequence
     write pkt
 
-    (pdu = read) && (pdu.app_tag == Net::LDAP::PDU::DeleteResponse) or raise Net::LDAP::LdapError, "response missing or invalid"
+    pdu = read
+
+    if !pdu || pdu.app_tag != Net::LDAP::PDU::DeleteResponse
+      raise Net::LDAP::LdapError, "response missing or invalid"
+    end
 
     pdu
   end
