diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-02-13 12:59:43 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-02-13 22:36:12 +1100 |
| commit | 5549190b37a2bfc01f5cbff89da47b7ca4bd84fa (patch) | |
| tree | bf93d3c120e6c176cee7574f04e866a447c29814 /source4/dsdb/schema/schema_query.c | |
| parent | 1373e748aa53fbd3afe4d2377208257d42628d86 (diff) | |
| download | samba-5549190b37a2bfc01f5cbff89da47b7ca4bd84fa.tar.gz samba-5549190b37a2bfc01f5cbff89da47b7ca4bd84fa.tar.bz2 samba-5549190b37a2bfc01f5cbff89da47b7ca4bd84fa.zip | |
s4-dsdb: use TYPESAFE_QSORT() in dsdb code
Diffstat (limited to 'source4/dsdb/schema/schema_query.c')
| -rw-r--r-- | source4/dsdb/schema/schema_query.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source4/dsdb/schema/schema_query.c b/source4/dsdb/schema/schema_query.c index 4e11e50c17..ff54488251 100644 --- a/source4/dsdb/schema/schema_query.c +++ b/source4/dsdb/schema/schema_query.c @@ -23,6 +23,7 @@ #include "includes.h" #include "dsdb/samdb/samdb.h" #include "lib/util/binsearch.h" +#include "lib/util/tsort.h" static const char **dsdb_full_attribute_list_internal(TALLOC_CTX *mem_ctx, const struct dsdb_schema *schema, @@ -379,11 +380,8 @@ static const char **dsdb_full_attribute_list_internal_el(TALLOC_CTX *mem_ctx, return attr_list; } -static int qsort_string(const void *v1, - const void *v2) +static int qsort_string(const char **s1, const char **s2) { - char * const *s1 = v1; - char * const *s2 = v2; return strcasecmp(*s1, *s2); } @@ -394,9 +392,7 @@ static const char **dedup_attr_list(const char **attr_list) /* Remove duplicates */ if (new_len > 1) { int i; - qsort(attr_list, new_len, - sizeof(*attr_list), - (comparison_fn_t)qsort_string); + TYPESAFE_QSORT(attr_list, new_len, qsort_string); for (i=1 ; i < new_len; i++) { const char **val1 = &attr_list[i-1]; |