Fix prev commit

[openldap] / libraries / libldap / sort.c

diff --git a/libraries/libldap/sort.c b/libraries/libldap/sort.c
index 2ac3c31a81b6f51588a6764fbd10d6fde843b98e..3f8484c8ea326e6d9ed140f73d3128c0bea7d27f 100644 (file)
--- a/libraries/libldap/sort.c
+++ b/libraries/libldap/sort.c
@@ -1,4 +1,9 @@
+/* $OpenLDAP$ */
 /*
+ * Copyright 1998-2003 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,43 +20,42 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/string.h>
 #include <ac/time.h>
 
-#include "lber.h"
-#include "ldap.h"
 
+#include "ldap-int.h"
 
 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(( char *a, char *b ));
-static int     et_cmp LDAP_P(( void *aa, void *bb));
+static int     et_cmp LDAP_P(( const void *aa, const void *bb));
 
 
 int
 ldap_sort_strcasecmp(
-    char       **a,
-    char       **b
+       LDAP_CONST void *a,
+       LDAP_CONST void *b
 )
 {
-       return( strcasecmp( *a, *b ) );
+       return( strcasecmp( *(char *const *)a, *(char *const *)b ) );
 }
 
 static int
 et_cmp(
-       void    *aa,
-       void    *bb
+       const void      *aa,
+       const void      *bb
 )
 {
        int                     i, rc;
-       struct entrything       *a = (struct entrything *)aa;
-       struct entrything       *b = (struct entrything *)bb;
+       const struct entrything *a = (const struct entrything *)aa;
+       const struct entrything *b = (const struct entrything *)bb;
 
        if ( a->et_vals == NULL && b->et_vals == NULL )
                return( 0 );
@@ -61,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 );
                }
        }
@@ -78,8 +81,8 @@ int
 ldap_sort_entries(
     LDAP       *ld,
     LDAPMessage        **chain,
-    char       *attr,          /* NULL => sort by DN */
-    int                (*cmp) LDAP_P((char *, char *))
+    LDAP_CONST char    *attr,          /* NULL => sort by DN */
+    int                (*cmp) (LDAP_CONST  char *, LDAP_CONST char *)
 )
 {
        int                     i, count;
@@ -87,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 );
@@ -97,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 );
                }
@@ -112,7 +126,6 @@ ldap_sort_entries(
        }
        last = e;
 
-       et_cmp_fn = cmp;
        qsort( et, count, sizeof(struct entrything), et_cmp );
 
        ep = chain;
@@ -120,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 );
 }
@@ -132,7 +145,7 @@ int
 ldap_sort_values(
     LDAP       *ld,
     char       **vals,
-    int                (*cmp) LDAP_P((const void *, const void *))
+    int                (*cmp) (LDAP_CONST void *, LDAP_CONST void *)
 )
 {
        int     nel;