diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2019-10-16 16:39:35 +1300 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2019-10-18 09:26:41 +0000 |
| commit | 5bc35614253b4769590813249274355fd3d2ae53 (patch) | |
| tree | 4e96c0fa312f4bf338760c9c1164972c35105930 /source4 | |
| parent | 517342399c0a558fc016d06ce7728f3c56ef952e (diff) | |
| download | samba-5bc35614253b4769590813249274355fd3d2ae53.tar.gz | |
s4-rpc_server: Change LDB_TYPESAFE_QSORT() to TYPESAFE_QSORT() in getncchanges
This call does not use the context argument so no additional parameter is needed.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: David Mulder <dmulder@suse.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/rpc_server/drsuapi/getncchanges.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/source4/rpc_server/drsuapi/getncchanges.c b/source4/rpc_server/drsuapi/getncchanges.c index 9a4da547e04..c9b0f65d263 100644 --- a/source4/rpc_server/drsuapi/getncchanges.c +++ b/source4/rpc_server/drsuapi/getncchanges.c @@ -179,7 +179,7 @@ static int uint32_t_cmp(uint32_t a1, uint32_t a2) return a1 > a2 ? 1 : -1; } -static int uint32_t_ptr_cmp(uint32_t *a1, uint32_t *a2, void *unused) +static int uint32_t_ptr_cmp(uint32_t *a1, uint32_t *a2) { if (*a1 == *a2) return 0; return *a1 > *a2 ? 1 : -1; @@ -992,8 +992,7 @@ static WERROR get_nc_changes_udv(struct ldb_context *sam_ctx, /* comparison function for linked attributes - see CompareLinks() in * MS-DRSR section 4.1.10.5.17 */ static int linked_attribute_compare(const struct la_for_sorting *la1, - const struct la_for_sorting *la2, - void *opaque) + const struct la_for_sorting *la2) { int c; c = memcmp(la1->source_guid, @@ -2086,7 +2085,7 @@ static WERROR getncchanges_get_sorted_array(const struct drsuapi_DsReplicaLinked TALLOC_FREE(frame); } - LDB_TYPESAFE_QSORT(guid_array, link_count, NULL, linked_attribute_compare); + TYPESAFE_QSORT(guid_array, link_count, linked_attribute_compare); *ret_array = guid_array; @@ -3244,10 +3243,9 @@ allowed: NULL); } - LDB_TYPESAFE_QSORT(local_pas, - req10->partial_attribute_set->num_attids, - NULL, - uint32_t_ptr_cmp); + TYPESAFE_QSORT(local_pas, + req10->partial_attribute_set->num_attids, + uint32_t_ptr_cmp); } /* |