X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fgetentry.c;h=4fb23eff6cb69bc0993f0daec9c65963daf39231;hb=70092b38fb23b9141a2b8414fb5a9c5200f3c12d;hp=272ea304add86cbc71b7fd04a4f64debb33836b9;hpb=669b8f4047c03d4583a44ed8287d0d5920d15373;p=openldap

diff --git a/libraries/libldap/getentry.c b/libraries/libldap/getentry.c
index 272ea304ad..4fb23eff6c 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-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -14,7 +15,6 @@
 #include <stdio.h>
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
@@ -27,10 +27,7 @@ ldap_first_entry( LDAP *ld, LDAPMessage *chain )
 {
 	assert( ld != NULL );
 	assert( LDAP_VALID( ld ) );
-
-	if( ld == NULL || chain == NULL ) {
-		return NULL;
-	}
+	assert( chain != NULL );
 
 	return chain->lm_msgtype == LDAP_RES_SEARCH_ENTRY
 		? chain
@@ -42,12 +39,9 @@ ldap_next_entry( LDAP *ld, LDAPMessage *entry )
 {
 	assert( ld != NULL );
 	assert( LDAP_VALID( ld ) );
+	assert( entry != NULL );
 
-	if ( ld == NULL || entry == NULL ) {
-		return NULL;
-	}
-
-	for (
+	for(
 		entry = entry->lm_chain;
 		entry != NULL;
 		entry = entry->lm_chain )
@@ -68,10 +62,6 @@ ldap_count_entries( 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 ) {
 		if( chain->lm_msgtype == LDAP_RES_SEARCH_ENTRY ) {
 			i++;
@@ -95,14 +85,12 @@ ldap_get_entry_controls(
 	assert( entry != NULL );
 	assert( sctrls != NULL );
 
-	if ( ld == NULL || sctrls == NULL ||
-		entry == NULL || entry->lm_msgtype == LDAP_RES_SEARCH_ENTRY )
-	{
+	if ( entry->lm_msgtype != LDAP_RES_SEARCH_ENTRY ) {
 		return LDAP_PARAM_ERROR;
 	}
 
 	/* make a local copy of the BerElement */
-	SAFEMEMCPY(&be, entry->lm_ber, sizeof(be));
+	AC_MEMCPY(&be, entry->lm_ber, sizeof(be));
 
 	if ( ber_scanf( &be, "{xx" /*}*/ ) == LBER_ERROR ) {
 		rc = LDAP_DECODING_ERROR;