sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

s3: last part of TYPESAFE_QSORT() conversion

Browse Source 
convert smbcacls, sharesec and web/
This commit is contained in:
Andrew Tridgell 2010-02-14 10:03:55 +11:00
parent 3f0898a9f5
commit 862a17e9ba
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/utils/sharesec.c
View File

@ -388,7 +388,7 @@ static void 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])) {

2
source3/utils/smbcacls.c
View File

@ -792,7 +792,7 @@ static void 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])) {

7
source3/web/neg_lang.c
View File

@ -51,9 +51,8 @@ struct pri_list {
char *string;
};
static int qsort_cmp_list(const void *x, const void *y) {
struct pri_list *a = (struct pri_list *)x;
struct pri_list *b = (struct pri_list *)y;
static int qsort_cmp_list(struct pri_list *a, struct pri_list *b)
{
if (a->pri > b->pri) return -1;
if (a->pri < b->pri) return 1;
return 0;
@ -101,7 +100,7 @@ void web_set_lang(const char *lang_string)
}
TALLOC_FREE(lang_list);
qsort(pl, lang_num, sizeof(struct pri_list), &qsort_cmp_list);
TYPESAFE_QSORT(pl, lang_num, qsort_cmp_list);
/* it's not an error to not initialise - we just fall back to
the default */