Added thread-pool getkey/setkey functions

[openldap] / libraries / libldap / getentry.c

diff --git a/libraries/libldap/getentry.c b/libraries/libldap/getentry.c
index 90e43fc14c4e3f178593cfb74c26673d38d46b1f..4fb23eff6cb69bc0993f0daec9c65963daf39231 100644 (file)
--- 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
@@ -12,9 +13,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
@@ -25,26 +25,25 @@
 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 );
 
        return chain->lm_msgtype == LDAP_RES_SEARCH_ENTRY
                ? 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 );
 
-       for (
+       for(
                entry = entry->lm_chain;
-               entry != NULLMSG;
+               entry != NULL;
                entry = entry->lm_chain )
        {
                if( entry->lm_msgtype == LDAP_RES_SEARCH_ENTRY ) {
@@ -52,18 +51,16 @@ ldap_next_entry( LDAP *ld, LDAPMessage *entry )
                }
        }
 
-       return( NULLMSG );
+       return( NULL );
 }
 
-/* ARGSUSED */
 int
 ldap_count_entries( LDAP *ld, LDAPMessage *chain )
 {
        int     i;
 
-       if ( ld == NULL ) {
-               return -1;
-       }
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
 
        for ( i = 0; chain != NULL; chain = chain->lm_chain ) {
                if( chain->lm_msgtype == LDAP_RES_SEARCH_ENTRY ) {
@@ -78,26 +75,29 @@ int
 ldap_get_entry_controls(
        LDAP *ld,
        LDAPMessage *entry, 
-       LDAPControl ***serverctrls)
+       LDAPControl ***sctrls )
 {
        int rc;
        BerElement be;
 
-       if ( ld == NULL || serverctrls == NULL ||
-               entry == NULL || entry->lm_msgtype == LDAP_RES_SEARCH_ENTRY )
-       {
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+       assert( entry != NULL );
+       assert( sctrls != NULL );
+
+       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;
                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 ) {