Move LDAPServer, LDAPConn, LDAPRequest, and LDAPCache

[openldap] / libraries / libldap / sort.c

diff --git a/libraries/libldap/sort.c b/libraries/libldap/sort.c
index a0137b0605ef55baee56ef7c167379548827831d..6738fba022c48b576fccddff005b9e2f0c544fdb 100644 (file)
--- a/libraries/libldap/sort.c
+++ b/libraries/libldap/sort.c
@@ -21,36 +21,36 @@
 #include <ac/string.h>
 #include <ac/time.h>
 
-#include "ldap-int.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
+       const void      *a,
+       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 );
@@ -60,8 +60,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,7 +77,7 @@ ldap_sort_entries(
     LDAP       *ld,
     LDAPMessage        **chain,
     char       *attr,          /* NULL => sort by DN */
-    int                (*cmp) LDAP_P((char *, char *))
+    int                (*cmp) (const char *, const char *)
 )
 {
        int                     i, count;
@@ -96,6 +95,7 @@ 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;
@@ -111,7 +111,6 @@ ldap_sort_entries(
        }
        last = e;
 
-       et_cmp_fn = cmp;
        qsort( et, count, sizeof(struct entrything), et_cmp );
 
        ep = chain;
@@ -131,7 +130,7 @@ int
 ldap_sort_values(
     LDAP       *ld,
     char       **vals,
-    int                (*cmp) LDAP_P((const void *, const void *))
+    int                (*cmp) (const void *, const void *)
 )
 {
        int     nel;