X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fsort.c;h=3f8484c8ea326e6d9ed140f73d3128c0bea7d27f;hb=0e8b176d1ff00c81ebe57de14151357e7f8749d5;hp=36570bb1331c7ad6c9931f10e7162012a318b2a3;hpb=dc07e765f263ef459dcd2afd1ece01cfc85a0edd;p=openldap

diff --git a/libraries/libldap/sort.c b/libraries/libldap/sort.c
index 36570bb133..3f8484c8ea 100644
--- a/libraries/libldap/sort.c
+++ b/libraries/libldap/sort.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* Portions
@@ -19,7 +20,7 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/string.h>
@@ -39,8 +40,8 @@ static int	et_cmp LDAP_P(( const void *aa, const void *bb));
 
 int
 ldap_sort_strcasecmp(
-	const void	*a,
-	const void	*b
+	LDAP_CONST void	*a,
+	LDAP_CONST void	*b
 )
 {
 	return( strcasecmp( *(char *const *)a, *(char *const *)b ) );
@@ -89,13 +90,11 @@ ldap_sort_entries(
 	LDAPMessage		*e, *last;
 	LDAPMessage		**ep;
 
-	count = ldap_count_entries( ld, *chain );
+	assert( ld != NULL );
 
+	count = ldap_count_entries( ld, *chain );
 
 	if ( count < 0 ) {
-		if( ld != NULL ) {
-			ld->ld_errno = LDAP_PARAM_ERROR;
-		}
 		return -1;
 
 	} else if ( count < 2 ) {
@@ -103,7 +102,7 @@ ldap_sort_entries(
 		return 0;
 	}
 
-	if ( (et = (struct entrything *) malloc( count *
+	if ( (et = (struct entrything *) LDAP_MALLOC( count *
 	    sizeof(struct entrything) )) == NULL ) {
 		ld->ld_errno = LDAP_NO_MEMORY;
 		return( -1 );
@@ -118,7 +117,7 @@ ldap_sort_entries(
 
 			dn = ldap_get_dn( ld, e );
 			et[i].et_vals = ldap_explode_dn( dn, 1 );
-			free( dn );
+			LDAP_FREE( dn );
 		} else {
 			et[i].et_vals = ldap_get_values( ld, e, attr );
 		}
@@ -134,10 +133,10 @@ ldap_sort_entries(
 		*ep = et[i].et_msg;
 		ep = &(*ep)->lm_chain;
 
-		ldap_value_free( et[i].et_vals );
+		LDAP_VFREE( et[i].et_vals );
 	}
 	*ep = last;
-	free( (char *) et );
+	LDAP_FREE( (char *) et );
 
 	return( 0 );
 }
@@ -146,7 +145,7 @@ int
 ldap_sort_values(
     LDAP	*ld,
     char	**vals,
-    int		(*cmp) (const void *, const void *)
+    int		(*cmp) (LDAP_CONST void *, LDAP_CONST void *)
 )
 {
 	int	nel;