X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fgetentry.c;h=22c8b90ce8538252c82573356fae859fac5c78af;hb=d9a60db75ea1dbbc06d90d15e6f6969d8c075ee7;hp=5dc62fdf42ac72b4a83899ba433ce890f1db2e7d;hpb=dc07e765f263ef459dcd2afd1ece01cfc85a0edd;p=openldap
diff --git a/libraries/libldap/getentry.c b/libraries/libldap/getentry.c
index 5dc62fdf42..22c8b90ce8 100644
--- a/libraries/libldap/getentry.c
+++ b/libraries/libldap/getentry.c
@@ -1,20 +1,26 @@
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/* Portions
- * Copyright (c) 1990 Regents of the University of Michigan.
- * All rights reserved.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2011 The OpenLDAP Foundation.
+ * All rights reserved.
*
- * getentry.c
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
+ */
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
+ * All rights reserved.
*/
#include "portable.h"
#include
-#include
+#include
-#include
#include
#include
#include
@@ -25,26 +31,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 +57,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,40 +81,43 @@ 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_pvt_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;