X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fsort.c;h=84557eb33a8d248d0ddbbdf884da9494c14c3d1d;hb=8c30114d847ff034dd9e9382d88e276fa7f82833;hp=831947019dabbec8db1b2e76285dd2e1de09b282;hpb=7e6ad5100c2702b1d56a285bdfb341ddf38c0d76;p=openldap

diff --git a/libraries/libldap/sort.c b/libraries/libldap/sort.c
index 831947019d..84557eb33a 100644
--- a/libraries/libldap/sort.c
+++ b/libraries/libldap/sort.c
@@ -1,4 +1,9 @@
+/* $OpenLDAP$ */
 /*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+/* Portions
  * Copyright (c) 1994 Regents of the University of Michigan.
  * All rights reserved.
  *
@@ -15,7 +20,7 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/string.h>
@@ -27,16 +32,16 @@
 struct entrything {
 	char		**et_vals;
 	LDAPMessage	*et_msg;
+	int 		(*et_cmp_fn) LDAP_P((const char *a, const char *b));
 };
 
-static int	(*et_cmp_fn) LDAP_P(( const char *a, const char *b ));
 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 ) );
@@ -60,8 +65,7 @@ et_cmp(
 		return( 1 );
 
 	for ( i = 0; a->et_vals[i] && b->et_vals[i]; i++ ) {
-		if ( (rc = (*et_cmp_fn)( a->et_vals[i], b->et_vals[i] ))
-		    != 0 ) {
+		if ( (rc = a->et_cmp_fn( a->et_vals[i], b->et_vals[i] )) != 0 ) {
 			return( rc );
 		}
 	}
@@ -77,8 +81,8 @@ int
 ldap_sort_entries(
     LDAP	*ld,
     LDAPMessage	**chain,
-    char	*attr,		/* NULL => sort by DN */
-    int		(*cmp) (const char *, const char *)
+    LDAP_CONST char	*attr,		/* NULL => sort by DN */
+    int		(*cmp) (LDAP_CONST  char *, LDAP_CONST char *)
 )
 {
 	int			i, count;
@@ -86,9 +90,19 @@ ldap_sort_entries(
 	LDAPMessage		*e, *last;
 	LDAPMessage		**ep;
 
+	assert( ld != NULL );
+
 	count = ldap_count_entries( ld, *chain );
 
-	if ( (et = (struct entrything *) malloc( count *
+	if ( count < 0 ) {
+		return -1;
+
+	} else if ( count < 2 ) {
+		/* zero or one entries -- already sorted! */
+		return 0;
+	}
+
+	if ( (et = (struct entrything *) LDAP_MALLOC( count *
 	    sizeof(struct entrything) )) == NULL ) {
 		ld->ld_errno = LDAP_NO_MEMORY;
 		return( -1 );
@@ -96,13 +110,14 @@ ldap_sort_entries(
 
 	e = *chain;
 	for ( i = 0; i < count; i++ ) {
+		et[i].et_cmp_fn = cmp;
 		et[i].et_msg = e;
 		if ( attr == NULL ) {
 			char	*dn;
 
 			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 );
 		}
@@ -111,7 +126,6 @@ ldap_sort_entries(
 	}
 	last = e;
 
-	et_cmp_fn = cmp;
 	qsort( et, count, sizeof(struct entrything), et_cmp );
 
 	ep = chain;
@@ -119,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 );
 }
@@ -131,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;