diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-02-14 10:00:49 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-02-14 18:44:20 +1100 |
| commit | 8120bc2ba957fa78e04f6f5fc257c91a7f735e82 (patch) | |
| tree | 43e6fd9bac79ecbad7c1f7b7199bb8f42276ab9b /source3/libsmb | |
| parent | 7347ca359d6050575be70274a55b18628d0f3c5b (diff) | |
| download | samba-8120bc2ba957fa78e04f6f5fc257c91a7f735e82.tar.gz samba-8120bc2ba957fa78e04f6f5fc257c91a7f735e82.tar.bz2 samba-8120bc2ba957fa78e04f6f5fc257c91a7f735e82.zip | |
s3-lib: use TYPESAFE_QSORT() in remaining s3 library code
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.
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/libsmb_xattr.c | 3 | ||||
| -rw-r--r-- | source3/libsmb/nmblib.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c index 27c3e12399..cbdca4e748 100644 --- a/source3/libsmb/libsmb_xattr.c +++ b/source3/libsmb/libsmb_xattr.c @@ -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])) { diff --git a/source3/libsmb/nmblib.c b/source3/libsmb/nmblib.c index 1a2106675b..150e1f6af9 100644 --- a/source3/libsmb/nmblib.c +++ b/source3/libsmb/nmblib.c @@ -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); } |