+/* $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
#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>
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
: 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 ) {
}
}
- 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;
}
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 ( ld == NULL || sctrls == NULL ||
+ entry == NULL || 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 ) {
ld->ld_errno = rc;
- if( ld->ld_matched != NULL )
- free( ld->ld_matched );
-
- ld->ld_matched = NULL;
-
- if( ld->ld_error != NULL )
- free( ld->ld_error );
+ if( ld->ld_matched != NULL ) {
+ LDAP_FREE( ld->ld_matched );
+ ld->ld_matched = NULL;
+ }
- ld->ld_error = NULL;
+ if( ld->ld_error != NULL ) {
+ LDAP_FREE( ld->ld_error );
+ ld->ld_error = NULL;
+ }
}
return rc;