Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / libraries / libldap / getentry.c

diff --git a/libraries/libldap/getentry.c b/libraries/libldap/getentry.c
index ccdca5ea402e074b3feec2515a125a9ae4beb243..c8c4a75e88364fcd369a985632fac94bf234c3c6 100644 (file)
--- a/libraries/libldap/getentry.c
+++ b/libraries/libldap/getentry.c
@@ -1,13 +1,19 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 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.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2013 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
  *
- *  getentry.c
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
+ * All rights reserved.
  */
 
 #include "portable.h"
@@ -29,10 +35,6 @@ ldap_first_entry( LDAP *ld, LDAPMessage *chain )
        assert( LDAP_VALID( ld ) );
        assert( chain != NULL );
 
-       if( ld == NULL || chain == NULL ) {
-               return NULL;
-       }
-
        return chain->lm_msgtype == LDAP_RES_SEARCH_ENTRY
                ? chain
                : ldap_next_entry( ld, chain );
@@ -45,11 +47,7 @@ ldap_next_entry( LDAP *ld, LDAPMessage *entry )
        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 )
@@ -70,10 +68,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++;
@@ -97,21 +91,19 @@ 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;
                goto cleanup_and_return;
        }
 
-       rc = ldap_int_get_controls( &be, sctrls );
+       rc = ldap_pvt_get_controls( &be, sctrls );
 
 cleanup_and_return:
        if( rc != LDAP_SUCCESS ) {