1 files changed, 1 insertions, 90 deletions

diff --git a/apps/plugins/puzzles/src/sort.c b/apps/plugins/puzzles/src/sort.c
index d1897b6fdf..e82f4ec6dc 100644
--- a/apps/plugins/puzzles/src/sort.c
+++ b/apps/plugins/puzzles/src/sort.c
@@ -9,26 +9,8 @@
 
 #include "puzzles.h"
 
-static void memswap(void *av, void *bv, size_t size)
-{
-    char t[4096];
-    char *a = (char *)av, *b = (char *)bv;
-
-    while (size > 0) {
-        size_t thissize = size < sizeof(t) ? size : sizeof(t);
-
-        memcpy(t, a, thissize);
-        memcpy(a, b, thissize);
-        memcpy(b, t, thissize);
-
-        size -= thissize;
-        a += thissize;
-        b += thissize;
-    }
-}
-
 #define PTR(i) ((char *)array + size * (i))
-#define SWAP(i,j) memswap(PTR(i), PTR(j), size)
+#define SWAP(i,j) swap_regions(PTR(i), PTR(j), size)
 #define CMP(i,j) cmp(PTR(i), PTR(j), ctx)
 
 #define LCHILD(i) (2*(i)+1)
@@ -87,74 +69,3 @@ void arraysort_fn(void *array, size_t nmemb, size_t size,
         downheap(array, i, size, cmp, ctx, 0);
     }
 }
-
-#ifdef SORT_TEST
-
-#include <stdlib.h>
-#include <time.h>
-
-int testcmp(const void *av, const void *bv, void *ctx)
-{
-    int a = *(const int *)av, b = *(const int *)bv;
-    const int *keys = (const int *)ctx;
-    return keys[a] < keys[b] ? -1 : keys[a] > keys[b] ? +1 : 0;
-}
-
-int resetcmp(const void *av, const void *bv)
-{
-    int a = *(const int *)av, b = *(const int *)bv;
-    return a < b ? -1 : a > b ? +1 : 0;
-}
-
-int main(int argc, char **argv)
-{
-    typedef int Array[3723];
-    Array data, keys;
-    int iteration;
-    unsigned seed;
-
-    seed = (argc > 1 ? strtoul(argv[1], NULL, 0) : time(NULL));
-    printf("Random seed = %u\n", seed);
-    srand(seed);
-
-    for (iteration = 0; iteration < 10000; iteration++) {
-        int j;
-        const char *fail = NULL;
-
-        for (j = 0; j < lenof(data); j++) {
-            data[j] = j;
-            keys[j] = rand();
-        }
-
-        arraysort(data, lenof(data), testcmp, keys);
-
-        for (j = 1; j < lenof(data); j++) {
-            if (keys[data[j]] < keys[data[j-1]])
-                fail = "output misordered";
-        }
-        if (!fail) {
-            Array reset;
-            memcpy(reset, data, sizeof(data));
-            qsort(reset, lenof(reset), sizeof(*reset), resetcmp);
-            for (j = 0; j < lenof(reset); j++)
-                if (reset[j] != j)
-                    fail = "output not permuted";
-        }
-
-        if (fail) {
-            printf("Failed at iteration %d: %s\n", iteration, fail);
-            printf("Key values:\n");
-            for (j = 0; j < lenof(keys); j++)
-                printf("  [%2d] %10d\n", j, keys[j]);
-            printf("Output sorted order:\n");
-            for (j = 0; j < lenof(data); j++)
-                printf("  [%2d] %10d\n", data[j], keys[data[j]]);
-            return 1;
-        }
-    }
-
-    printf("OK\n");
-    return 0;
-}
-
-#endif /* SORT_TEST */