From 3ae75a424890fdeddd12535c9330186ec2fcd899 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 13 Feb 2010 13:26:51 +1100 Subject: s4: use LDB_TYPESAFE_QSORT() instead of ldb_qsort() --- source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'source4/dsdb/samdb/ldb_modules/repl_meta_data.c') diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index 9fd2c1e617..725ba2a47c 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -603,9 +603,7 @@ static int replmd_replPropertyMetaDataCtr1_sort(struct replPropertyMetaDataCtr1 DEBUG(6,("Sorting rpmd with attid exception %u rDN=%s DN=%s\n", rdn_sa->attributeID_id, rdn_name, ldb_dn_get_linearized(dn))); - ldb_qsort(ctr1->array, ctr1->count, sizeof(struct replPropertyMetaData1), - discard_const_p(void, &rdn_sa->attributeID_id), - (ldb_qsort_cmp_fn_t)replmd_replPropertyMetaData1_attid_sort); + LDB_TYPESAFE_QSORT(ctr1->array, ctr1->count, &rdn_sa->attributeID_id, replmd_replPropertyMetaData1_attid_sort); return LDB_SUCCESS; } @@ -641,8 +639,7 @@ static int replmd_ldb_message_element_attid_sort(const struct ldb_message_elemen static void replmd_ldb_message_sort(struct ldb_message *msg, const struct dsdb_schema *schema) { - ldb_qsort(msg->elements, msg->num_elements, sizeof(struct ldb_message_element), - discard_const_p(void, schema), (ldb_qsort_cmp_fn_t)replmd_ldb_message_element_attid_sort); + LDB_TYPESAFE_QSORT(msg->elements, msg->num_elements, schema, replmd_ldb_message_element_attid_sort); } static int replmd_build_la_val(TALLOC_CTX *mem_ctx, struct ldb_val *v, struct dsdb_dn *dsdb_dn, -- cgit