sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s3-lib: use TYPESAFE_QSORT() in remaining s3 library code

Browse Source 
the sort_query_replies() in nmblib.c is a TODO. It uses a hack that
treats a char* as a structure. I've left that one alone for now.
This commit is contained in:
Andrew Tridgell 2010-02-14 10:00:49 +11:00
parent 7347ca359d
commit 8120bc2ba9
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/libads/dns.c
View File

@ -563,7 +563,7 @@ static NTSTATUS ads_dns_lookup_srv( TALLOC_CTX *ctx,
}
}
qsort( dcs, idx, sizeof(struct dns_rr_srv), QSORT_CAST dnssrvcmp );
TYPESAFE_QSORT(dcs, idx, dnssrvcmp );
*dclist = dcs;
*numdcs = idx;

3
source3/libsmb/libsmb_xattr.c
View File

@ -145,8 +145,7 @@ sort_acl(SEC_ACL *the_acl)
uint32 i;
if (!the_acl) return;
qsort(the_acl->aces, the_acl->num_aces, sizeof(the_acl->aces[0]),
QSORT_CAST ace_compare);
TYPESAFE_QSORT(the_acl->aces, the_acl->num_aces, ace_compare);
for (i=1;i<the_acl->num_aces;) {
if (sec_ace_equal(&the_acl->aces[i-1], &the_acl->aces[i])) {

4
source3/libsmb/nmblib.c
View File

@ -1232,6 +1232,10 @@ void sort_query_replies(char *data, int n, struct in_addr ip)
putip(sort_ip, (char *)&ip);
/* TODO:
this can't use TYPESAFE_QSORT() as the types are wrong.
It should be fixed to use a real type instead of char*
*/
qsort(data, n, 6, QSORT_CAST name_query_comp);
}