diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-02-13 13:26:51 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-02-13 22:36:12 +1100 |
| commit | 3ae75a424890fdeddd12535c9330186ec2fcd899 (patch) | |
| tree | 032ac645d93897748fd5d501d94cd998a719fd01 /source4/lib/ldb | |
| parent | 46dfa9dfbdd7649cd8a71e9727aff830a58e4d55 (diff) | |
| download | samba-3ae75a424890fdeddd12535c9330186ec2fcd899.tar.gz samba-3ae75a424890fdeddd12535c9330186ec2fcd899.tar.bz2 samba-3ae75a424890fdeddd12535c9330186ec2fcd899.zip | |
s4: use LDB_TYPESAFE_QSORT() instead of ldb_qsort()
Diffstat (limited to 'source4/lib/ldb')
| -rw-r--r-- | source4/lib/ldb/modules/sort.c | 4 | ||||
| -rw-r--r-- | source4/lib/ldb/tools/ldbsearch.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/source4/lib/ldb/modules/sort.c b/source4/lib/ldb/modules/sort.c index 5d1431d739..4ef7a0cecb 100644 --- a/source4/lib/ldb/modules/sort.c +++ b/source4/lib/ldb/modules/sort.c @@ -144,9 +144,7 @@ static int server_sort_results(struct sort_context *ac) ac->a = ldb_schema_attribute_by_name(ldb, ac->attributeName); ac->sort_result = 0; - ldb_qsort(ac->msgs, ac->num_msgs, - sizeof(struct ldb_message *), - ac, (ldb_qsort_cmp_fn_t)sort_compare); + LDB_TYPESAFE_QSORT(ac->msgs, ac->num_msgs, ac, sort_compare); if (ac->sort_result != LDB_SUCCESS) { return ac->sort_result; diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c index 8f7ee1ce38..207b344195 100644 --- a/source4/lib/ldb/tools/ldbsearch.c +++ b/source4/lib/ldb/tools/ldbsearch.c @@ -248,8 +248,7 @@ again: int i; if (sctx->num_stored) { - ldb_qsort(sctx->store, sctx->num_stored, sizeof(struct ldb_message *), - ldb, (ldb_qsort_cmp_fn_t)do_compare_msg); + LDB_TYPESAFE_QSORT(sctx->store, sctx->num_stored, ldb, do_compare_msg); } for (i = 0; i < sctx->num_stored; i++) { display_message(sctx->store[i], sctx); |