X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fmessages.c;h=bcb13a7f1461d4697705cdfe67387a07c183eec0;hb=fe86a81e251bda73f04841f765b2a93ac0354396;hp=57cd4dbd43a411d8598d611c19426ccd465e3240;hpb=29d9fa20a2823c827f098d78f1ea8539d86bf4cf;p=openldap

diff --git a/libraries/libldap/messages.c b/libraries/libldap/messages.c
index 57cd4dbd43..bcb13a7f14 100644
--- a/libraries/libldap/messages.c
+++ b/libraries/libldap/messages.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
@@ -13,7 +13,6 @@
 
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
@@ -25,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;
 }
 
@@ -38,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
@@ -54,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++;
 	}