diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-02-13 13:01:08 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-02-13 22:36:12 +1100 |
| commit | 700f4649511dbef417e639509d2f3374b5c8c6f3 (patch) | |
| tree | 1df983dacd7e07e6c4cc06360531f47f05d4f0dc /source4/torture/raw/streams.c | |
| parent | f954f522a457a44e7b298e553907d59d670c9051 (diff) | |
| download | samba-700f4649511dbef417e639509d2f3374b5c8c6f3.tar.gz samba-700f4649511dbef417e639509d2f3374b5c8c6f3.tar.bz2 samba-700f4649511dbef417e639509d2f3374b5c8c6f3.zip | |
s4-torture: use TYPESAFE_QSORT() in smbtorture
Diffstat (limited to 'source4/torture/raw/streams.c')
| -rw-r--r-- | source4/torture/raw/streams.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c index a55575b6a3..5d4167dbd3 100644 --- a/source4/torture/raw/streams.c +++ b/source4/torture/raw/streams.c @@ -26,6 +26,7 @@ #include "system/filesys.h" #include "libcli/libcli.h" #include "torture/util.h" +#include "lib/util/tsort.h" #define BASEDIR "\\teststreams" @@ -106,17 +107,13 @@ static bool check_stream(struct smbcli_state *cli, const char *location, return true; } -static int qsort_string(const void *v1, const void *v2) +static int qsort_string(char * const *s1, char * const *s2) { - char * const *s1 = (char * const *)v1; - char * const *s2 = (char * const *)v2; return strcmp(*s1, *s2); } -static int qsort_stream(const void *v1, const void *v2) +static int qsort_stream(const struct stream_struct *s1, const struct stream_struct *s2) { - const struct stream_struct * s1 = (const struct stream_struct *)v1; - const struct stream_struct * s2 = (const struct stream_struct *)v2; return strcmp(s1->stream_name.s, s2->stream_name.s); } @@ -152,7 +149,7 @@ static bool check_stream_list(struct torture_context *tctx, goto done; } - qsort(exp_sort, num_exp, sizeof(*exp_sort), qsort_string); + TYPESAFE_QSORT(exp_sort, num_exp, qsort_string); stream_sort = (struct stream_struct *)talloc_memdup(tmp_ctx, finfo.stream_info.out.streams, @@ -163,8 +160,7 @@ static bool check_stream_list(struct torture_context *tctx, goto done; } - qsort(stream_sort, finfo.stream_info.out.num_streams, - sizeof(*stream_sort), qsort_stream); + TYPESAFE_QSORT(stream_sort, finfo.stream_info.out.num_streams, qsort_stream); for (i=0; i<num_exp; i++) { if (strcmp(exp_sort[i], stream_sort[i].stream_name.s) != 0) { |