cleanup last commit, add commit

[openldap] / libraries / libldap / references.c

diff --git a/libraries/libldap/references.c b/libraries/libldap/references.c
index 4ec4d91bb60e84a74789c42bb75c53c8c9ad0d31..84b6d69716178a568709b65d796d088fa4df9789 100644 (file)
--- a/libraries/libldap/references.c
+++ b/libraries/libldap/references.c
@@ -1,9 +1,17 @@
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/*
- *  references.c
+/* references.c */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 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.
+ *
+ * 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>.
  */
 
 #include "portable.h"
@@ -12,7 +20,6 @@
 
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
@@ -24,11 +31,7 @@ ldap_first_reference( LDAP *ld, LDAPMessage *chain )
 {
        assert( ld != NULL );
        assert( LDAP_VALID( ld ) );
-       assert( chain !=  NULL );
-
-       if ( ld == NULL || chain == NULL ) {
-               return NULL;
-       }
+       assert( chain != NULL );
 
        return chain->lm_msgtype == LDAP_RES_SEARCH_REFERENCE
                ? chain
@@ -40,11 +43,7 @@ ldap_next_reference( LDAP *ld, LDAPMessage *ref )
 {
        assert( ld != NULL );
        assert( LDAP_VALID( ld ) );
-       assert( ref !=  NULL );
-
-       if ( ld == NULL || ref == NULL ) {
-               return NULL;
-       }
+       assert( ref != NULL );
 
        for (
                ref = ref->lm_chain;
@@ -66,13 +65,7 @@ ldap_count_references( LDAP *ld, LDAPMessage *chain )
 
        assert( ld != NULL );
        assert( LDAP_VALID( ld ) );
-       assert( chain !=  NULL );
-
-       if ( ld == NULL ) {
-               return -1;
-       }
 
-       
        for ( i = 0; chain != NULL; chain = chain->lm_chain ) {
                if( chain->lm_msgtype == LDAP_RES_SEARCH_REFERENCE ) {
                        i++;
@@ -98,14 +91,12 @@ ldap_parse_reference(
        assert( LDAP_VALID( ld ) );
        assert( ref !=  NULL );
 
-       if( ld == NULL || ref == NULL ||
-               ref->lm_msgtype != LDAP_RES_SEARCH_REFERENCE )
-       {
+       if( ref->lm_msgtype != LDAP_RES_SEARCH_REFERENCE ) {
                return LDAP_PARAM_ERROR;
        }
 
        /* make a private copy of BerElement */
-       SAFEMEMCPY(&be, ref->lm_ber, sizeof(be));
+       AC_MEMCPY(&be, ref->lm_ber, sizeof(be));
        
        if ( ber_scanf( &be, "{v" /*}*/, &refs ) == LBER_ERROR ) {
                rc = LDAP_DECODING_ERROR;
@@ -122,7 +113,7 @@ ldap_parse_reference(
                goto free_and_return;
        }
 
-       rc = ldap_int_get_controls( &be, serverctrls );
+       rc = ldap_pvt_get_controls( &be, serverctrls );
 
 free_and_return:
 
@@ -131,7 +122,7 @@ free_and_return:
                *referralsp = refs;
 
        } else {
-               ldap_value_free( refs );
+               LDAP_VFREE( refs );
        }
 
        if( freeit ) {