X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Freferences.c;h=371919db10de2318b04555649645fc194570e6fe;hb=403f4479bc9f9a864122d4aeecf7284408918302;hp=a1e4731dc0cbf92bf3bf9307c38245a9f2006842;hpb=ff447a31e23aef8c479356f0ead124b317026b86;p=openldap

diff --git a/libraries/libldap/references.c b/libraries/libldap/references.c
index a1e4731dc0..371919db10 100644
--- a/libraries/libldap/references.c
+++ b/libraries/libldap/references.c
@@ -1,3 +1,8 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  *  references.c
  */
@@ -5,7 +10,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/socket.h>
@@ -14,12 +20,15 @@
 
 #include "ldap-int.h"
 
-/* ARGSUSED */
 LDAPMessage *
 ldap_first_reference( 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_REFERENCE
@@ -27,17 +36,20 @@ ldap_first_reference( LDAP *ld, LDAPMessage *chain )
 		: ldap_next_reference( ld, chain );
 }
 
-/* ARGSUSED */
 LDAPMessage *
 ldap_next_reference( LDAP *ld, LDAPMessage *ref )
 {
-	if ( ld == NULL || ref == NULLMSG ) {
-		return NULLMSG;
+	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
+	assert( ref !=  NULL );
+
+	if ( ld == NULL || ref == NULL ) {
+		return NULL;
 	}
 
 	for (
 		ref = ref->lm_chain;
-		ref != NULLMSG;
+		ref != NULL;
 		ref = ref->lm_chain )
 	{
 		if( ref->lm_msgtype == LDAP_RES_SEARCH_REFERENCE ) {
@@ -45,19 +57,23 @@ ldap_next_reference( LDAP *ld, LDAPMessage *ref )
 		}
 	}
 
-	return( NULLMSG );
+	return( NULL );
 }
 
-/* ARGSUSED */
 int
 ldap_count_references( LDAP *ld, LDAPMessage *chain )
 {
 	int	i;
 
+	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++;
@@ -79,6 +95,10 @@ ldap_parse_reference(
 	char **refs = NULL;
 	int rc;
 
+	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
+	assert( ref !=  NULL );
+
 	if( ld == NULL || ref == NULL ||
 		ref->lm_msgtype != LDAP_RES_SEARCH_REFERENCE )
 	{
@@ -103,7 +123,7 @@ ldap_parse_reference(
 		goto free_and_return;
 	}
 
-	rc = ldap_get_ber_controls( &be, serverctrls );
+	rc = ldap_int_get_controls( &be, serverctrls );
 
 free_and_return:
 
@@ -122,15 +142,15 @@ free_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;