summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/util/util_strlist.c3
-rw-r--r--libcli/security/secace.c9
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/util/util_strlist.c b/lib/util/util_strlist.c
index 6d1a695987..af733d10cc 100644
--- a/lib/util/util_strlist.c
+++ b/lib/util/util_strlist.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "system/locale.h"
+#include "lib/util/tsort.h"
#undef strcasecmp
@@ -393,7 +394,7 @@ _PUBLIC_ const char **str_list_unique(const char **list)
}
list2 = (const char **)talloc_memdup(list, list,
sizeof(list[0])*(len+1));
- qsort(list2, len, sizeof(list2[0]), QSORT_CAST list_cmp);
+ TYPESAFE_QSORT(list2, len, list_cmp);
list[0] = list2[0];
for (i=j=1;i<len;i++) {
if (strcmp(list2[i], list[j-1]) != 0) {
diff --git a/libcli/security/secace.c b/libcli/security/secace.c
index 7d87b1cd5e..8a73a6ab94 100644
--- a/libcli/security/secace.c
+++ b/libcli/security/secace.c
@@ -23,6 +23,7 @@
#include "includes.h"
#include "librpc/gen_ndr/ndr_security.h"
#include "libcli/security/dom_sid.h"
+#include "lib/util/tsort.h"
#define SEC_ACE_HEADER_SIZE (2 * sizeof(uint8_t) + sizeof(uint16_t) + sizeof(uint32_t))
@@ -257,7 +258,7 @@ void dacl_sort_into_canonical_order(struct security_ace *srclist, unsigned int n
return;
/* Sort so that non-inherited ACE's come first. */
- qsort( srclist, num_aces, sizeof(srclist[0]), QSORT_CAST nt_ace_inherit_comp);
+ TYPESAFE_QSORT(srclist, num_aces, nt_ace_inherit_comp);
/* Find the boundary between non-inherited ACEs. */
for (i = 0; i < num_aces; i++ ) {
@@ -270,12 +271,10 @@ void dacl_sort_into_canonical_order(struct security_ace *srclist, unsigned int n
/* i now points at entry number of the first inherited ACE. */
/* Sort the non-inherited ACEs. */
- if (i)
- qsort( srclist, i, sizeof(srclist[0]), QSORT_CAST nt_ace_canon_comp);
+ TYPESAFE_QSORT(srclist, i, nt_ace_canon_comp);
/* Now sort the inherited ACEs. */
- if (num_aces - i)
- qsort( &srclist[i], num_aces - i, sizeof(srclist[0]), QSORT_CAST nt_ace_canon_comp);
+ TYPESAFE_QSORT(&srclist[i], num_aces - i, nt_ace_canon_comp);
}