X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Fsorter%2Fsort-test.c;h=fcd782a84f238f85291ac86db325c0d7e02f0827;hb=25541ea3bb96e9f143f0e23f8ac5b432f2f6f47a;hp=17c6e7f0d09c72b7aeeed71adf021df7b8d9e06c;hpb=3366235d970c8516d4e1bc8be66c522ab106801b;p=libucw.git diff --git a/ucw/sorter/sort-test.c b/ucw/sorter/sort-test.c index 17c6e7f0..fcd782a8 100644 --- a/ucw/sorter/sort-test.c +++ b/ucw/sorter/sort-test.c @@ -409,8 +409,6 @@ static int s5_gen(struct s5_pair *p) #define ASORT_PREFIX(x) s5m_##x #define ASORT_KEY_TYPE u32 -#define ASORT_ELT(i) ary[i] -#define ASORT_EXTRA_ARGS , u32 *ary #include "ucw/sorter/array-simple.h" static void s5_write_merged(struct fastbuf *f, struct key5 **keys, void **data, uns n, void *buf) @@ -422,7 +420,7 @@ static void s5_write_merged(struct fastbuf *f, struct key5 **keys, void **data, memcpy(&a[m], data[i], 4*keys[i]->cnt); m += keys[i]->cnt; } - s5m_sort(m, a); + s5m_sort(a, m); keys[0]->cnt = m; bwrite(f, keys[0], sizeof(struct key5)); bwrite(f, a, 4*m);