X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fsort.c;h=706f8a768dfbf3e98157a2b950d93061eac7cf88;hb=bb17493d31e19c47bc3a906a39ffa3d57e28aaa4;hp=c62961b7731f6cc9367d45d88f949a6d33f4e273;hpb=24c81ea5996ece732816c1699a3a8b7165641286;p=openldap diff --git a/libraries/libldap/sort.c b/libraries/libldap/sort.c index c62961b773..706f8a768d 100644 --- 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,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 ) ); @@ -135,7 +135,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 +147,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;