+/* $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.
*
#include "portable.h"
#include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
#include <ac/ctype.h>
#include <ac/string.h>
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 ) );
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;
count = ldap_count_entries( ld, *chain );
- if ( (et = (struct entrything *) malloc( count *
+
+ if ( count < 0 ) {
+ if( ld != NULL ) {
+ ld->ld_errno = LDAP_PARAM_ERROR;
+ }
+ 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 );
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 );
}
*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 );
}
ldap_sort_values(
LDAP *ld,
char **vals,
- int (*cmp) (const void *, const void *)
+ int (*cmp) (LDAP_CONST void *, LDAP_CONST void *)
)
{
int nel;