X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fmessages.c;h=bcb13a7f1461d4697705cdfe67387a07c183eec0;hb=fe86a81e251bda73f04841f765b2a93ac0354396;hp=5c9a96474122f2eb6d5f80fab684cfeb3af61364;hpb=0e2af54a3ffdeebe3901370683be56fcc53023b0;p=openldap

diff --git a/libraries/libldap/messages.c b/libraries/libldap/messages.c
index 5c9a964741..bcb13a7f14 100644
--- a/libraries/libldap/messages.c
+++ b/libraries/libldap/messages.c
@@ -24,11 +24,8 @@ ldap_first_message( LDAP *ld, LDAPMessage *chain )
 {
 	assert( ld != NULL );
 	assert( LDAP_VALID( ld ) );
+	assert( chain != NULL );
 
-	if ( ld == NULL || chain == NULL ) {
-		return NULL;
-	}
-	
   	return chain;
 }
 
@@ -37,12 +34,9 @@ ldap_next_message( LDAP *ld, LDAPMessage *msg )
 {
 	assert( ld != NULL );
 	assert( LDAP_VALID( ld ) );
+	assert( msg != NULL );
 
-	if ( ld == NULL || msg == NULL || msg->lm_chain == NULL ) {
-		return NULL;
-	}
-
-	return( msg->lm_chain );
+	return msg->lm_chain;
 }
 
 int
@@ -53,10 +47,6 @@ ldap_count_messages( LDAP *ld, LDAPMessage *chain )
 	assert( ld != NULL );
 	assert( LDAP_VALID( ld ) );
 
-	if ( ld == NULL ) {
-		return -1;
-	}
-
 	for ( i = 0; chain != NULL; chain = chain->lm_chain ) {
 		i++;
 	}