Update all calls to arraysort.h.

diff --git a/debug/sorter/retros.c b/debug/sorter/retros.c
index 0d417bab48429488ef85494ab95ebb99588ab0f5..7bb692f6bead3094d3d3b06a6ea8a9088d3a0042 100644 (file)
--- a/debug/sorter/retros.c
+++ b/debug/sorter/retros.c
@@ -51,13 +51,13 @@ static int comp_ind(const void *x, const void *y)
 #define ASORT_ELT(i) a[i].key
 #define ASORT_SWAP(i,j) do { struct elt t=a[i]; a[i]=a[j]; a[j]=t; } while (0)
 #define ASORT_EXTRA_ARGS , struct elt *a
-#include "ucw/arraysort.h"
+#include "ucw/sorter/array-simple.h"
 
 #define ASORT_PREFIX(x) asi_##x
 #define ASORT_KEY_TYPE u32
 #define ASORT_ELT(i) ind[i]->key
 #define ASORT_SWAP(i,j) do { struct elt *t=ind[i]; ind[i]=ind[j]; ind[j]=t; } while (0)
-#include "ucw/arraysort.h"
+#include "ucw/sorter/array-simple.h"
 
 static void r1_sort(void)
 {

diff --git a/images/sig-cmp.c b/images/sig-cmp.c
index 028e1b6ac56288cfeb7b3d2e06548e1381094a6e..93e10210a8f203f38dc0865b9c8a24caff1324a3 100644 (file)
--- a/images/sig-cmp.c
+++ b/images/sig-cmp.c
@@ -20,7 +20,7 @@
 #define ASORT_KEY_TYPE uns
 #define ASORT_ELT(i) items[i]
 #define ASORT_EXTRA_ARGS , uns *items
-#include "ucw/arraysort.h"
+#include "ucw/sorter/array-simple.h"
 
 #define EXPLAIN
 #include "images/sig-cmp-gen.h"

diff --git a/images/sig-seg.c b/images/sig-seg.c
index b82c6ccd232173e701dd359f1719856a14c22f8b..7705656ee18819dafd148973e438e8ea91c819c0 100644 (file)
--- a/images/sig-seg.c
+++ b/images/sig-seg.c
@@ -95,7 +95,7 @@ prequant_heap_cmp(struct image_sig_region *a, struct image_sig_region *b)
 #define ASORT_KEY_TYPE uns
 #define ASORT_ELT(i) val[i]
 #define ASORT_EXTRA_ARGS , uns *val
-#include "ucw/arraysort.h"
+#include "ucw/sorter/array-simple.h"
 
 static uns
 prequant(struct image_sig_block *blocks, uns blocks_count, struct image_sig_region *regions)

diff --git a/ucw/asort-test.c b/ucw/asort-test.c
index aa6007356010e55157868f3cfc6ef7dc7aac8408..f89e0b86c4987f014572ff81e3f9329a5b09c906 100644 (file)
--- a/ucw/asort-test.c
+++ b/ucw/asort-test.c
@@ -62,7 +62,7 @@ static int qs_comp(const struct elt *X, const struct elt *Y)
 }
 
 #define ASORT_PREFIX(x) as_##x
-#include "ucw/arraysort.h"
+#include "ucw/sorter/array-simple.h"
 
 int main(void)
 {

diff --git a/ucw/conf-section.c b/ucw/conf-section.c
index 31b82a5c07848dc414930365c39f4ac54fe82127..4112d88883418cd2ffeae10ff9180948794fffb8 100644 (file)
--- a/ucw/conf-section.c
+++ b/ucw/conf-section.c
@@ -44,7 +44,7 @@ cf_add_dirty(struct cf_section *sec, void *ptr)
 #define ASORT_KEY_TYPE struct dirty_section
 #define ASORT_ELT(i)   dirty.ptr[i]
 #define ASORT_LT(x,y)  x.sec < y.sec || x.sec == y.sec && x.ptr < y.ptr
-#include "ucw/arraysort.h"
+#include "ucw/sorter/array-simple.h"
 
 static void
 sort_dirty(void)

diff --git a/ucw/sorter/sort-test.c b/ucw/sorter/sort-test.c
index a7515d71f9841514e523def08deae6192c4aa205..17c6e7f0d09c72b7aeeed71adf021df7b8d9e06c 100644 (file)
--- a/ucw/sorter/sort-test.c
+++ b/ucw/sorter/sort-test.c
@@ -411,7 +411,7 @@ static int s5_gen(struct s5_pair *p)
 #define ASORT_KEY_TYPE u32
 #define ASORT_ELT(i) ary[i]
 #define ASORT_EXTRA_ARGS , u32 *ary
-#include "ucw/arraysort.h"
+#include "ucw/sorter/array-simple.h"
 
 static void s5_write_merged(struct fastbuf *f, struct key5 **keys, void **data, uns n, void *buf)
 {