X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fmessages.c;h=33091da163ec568aba92864a95d71a8aba404472;hb=e0691dfbc07d0b2a0e6bec528b33802ed04f5960;hp=eea7bed70c660c596968e749c813f49581f3d8ca;hpb=21c70857f1029309d6bc5a5b6a93d7537494b742;p=openldap

diff --git a/libraries/libldap/messages.c b/libraries/libldap/messages.c
index eea7bed70c..33091da163 100644
--- a/libraries/libldap/messages.c
+++ b/libraries/libldap/messages.c
@@ -19,31 +19,40 @@
 
 #include "ldap-int.h"
 
-/* ARGSUSED */
 LDAPMessage *
 ldap_first_message( LDAP *ld, LDAPMessage *chain )
 {
-	return( ld == NULL || chain == NULLMSG
-	   		? NULLMSG : chain );
+	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
+
+	if ( ld == NULL || chain == NULL ) {
+		return NULL;
+	}
+	
+  	return chain;
 }
 
-/* ARGSUSED */
 LDAPMessage *
 ldap_next_message( LDAP *ld, LDAPMessage *msg )
 {
-	if ( ld == NULL || msg == NULLMSG || msg->lm_chain == NULL ) {
-		return NULLMSG;
+	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
+
+	if ( ld == NULL || msg == NULL || msg->lm_chain == NULL ) {
+		return NULL;
 	}
 
 	return( msg->lm_chain );
 }
 
-/* ARGSUSED */
 int
 ldap_count_messages( LDAP *ld, LDAPMessage *chain )
 {
 	int	i;
 
+	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
+
 	if ( ld == NULL ) {
 		return -1;
 	}