Added thread-pool getkey/setkey functions

[openldap] / libraries / libldap / sort.c

diff --git a/libraries/libldap/sort.c b/libraries/libldap/sort.c
index 4e766997890c5903d83a968c6547bf57f1a652e7..84557eb33a8d248d0ddbbdf884da9494c14c3d1d 100644 (file)
--- a/libraries/libldap/sort.c
+++ b/libraries/libldap/sort.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* Portions
@@ -40,11 +40,11 @@ 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( (const char *)a, (const char *)b ) );
+       return( strcasecmp( *(char *const *)a, *(char *const *)b ) );
 }
 
 static int
@@ -90,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 ) {
@@ -135,7 +133,7 @@ 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;
        LDAP_FREE( (char *) et );
@@ -147,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;