X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fgetentry.c;h=2cf17681d8cb2f18fe724e7c5fe601e13f1b3658;hb=8045b54124f0365b3d34d9d3220256f052f2b76b;hp=9e2e49c4db86ea05d8aae4d8eb2ba594f8e04905;hpb=21c70857f1029309d6bc5a5b6a93d7537494b742;p=openldap

diff --git a/libraries/libldap/getentry.c b/libraries/libldap/getentry.c
index 9e2e49c4db..2cf17681d8 100644
--- a/libraries/libldap/getentry.c
+++ b/libraries/libldap/getentry.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -25,8 +26,12 @@
 LDAPMessage *
 ldap_first_entry( LDAP *ld, LDAPMessage *chain )
 {
-	if( ld == NULL || chain == NULLMSG ) {
-		return NULLMSG;
+	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
+	assert( chain != NULL );
+
+	if( ld == NULL || chain == NULL ) {
+		return NULL;
 	}
 
 	return chain->lm_msgtype == LDAP_RES_SEARCH_ENTRY
@@ -34,17 +39,20 @@ ldap_first_entry( LDAP *ld, LDAPMessage *chain )
 		: ldap_next_entry( ld, chain );
 }
 
-/* ARGSUSED */
 LDAPMessage *
 ldap_next_entry( LDAP *ld, LDAPMessage *entry )
 {
-	if ( ld == NULL || entry == NULLMSG ) {
-		return NULLMSG;
+	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
+	assert( entry != NULL );
+
+	if ( ld == NULL || entry == NULL ) {
+		return NULL;
 	}
 
 	for (
 		entry = entry->lm_chain;
-		entry != NULLMSG;
+		entry != NULL;
 		entry = entry->lm_chain )
 	{
 		if( entry->lm_msgtype == LDAP_RES_SEARCH_ENTRY ) {
@@ -52,15 +60,17 @@ ldap_next_entry( LDAP *ld, LDAPMessage *entry )
 		}
 	}
 
-	return( NULLMSG );
+	return( NULL );
 }
 
-/* ARGSUSED */
 int
 ldap_count_entries( LDAP *ld, LDAPMessage *chain )
 {
 	int	i;
 
+	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
+
 	if ( ld == NULL ) {
 		return -1;
 	}
@@ -78,12 +88,17 @@ int
 ldap_get_entry_controls(
 	LDAP *ld,
 	LDAPMessage *entry, 
-	LDAPControl ***serverctrls)
+	LDAPControl ***sctrls )
 {
 	int rc;
 	BerElement be;
 
-	if ( ld == NULL || serverctrls == NULL ||
+	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
+	assert( entry != NULL );
+	assert( sctrls != NULL );
+
+	if ( ld == NULL || sctrls == NULL ||
 		entry == NULL || entry->lm_msgtype == LDAP_RES_SEARCH_ENTRY )
 	{
 		return LDAP_PARAM_ERROR;
@@ -97,7 +112,7 @@ ldap_get_entry_controls(
 		goto cleanup_and_return;
 	}
 
-	rc = ldap_int_get_controls( &be, serverctrls );
+	rc = ldap_int_get_controls( &be, sctrls );
 
 cleanup_and_return:
 	if( rc != LDAP_SUCCESS ) {