From a2f7f962ced158dbceebbfc0c3dfbbc58b119e55 Mon Sep 17 00:00:00 2001 From: Franklin Wei Date: Sun, 21 Jul 2024 18:33:01 -0400 Subject: Rename memswap() to swap_regions(). Consolidate duplicate implementations. C99 reserves the mem* namespace for future expansion. Some Rockbox targets had issues with memswap() conflicting with another definition, so fix that. --- sort.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'sort.c') diff --git a/sort.c b/sort.c index 6dff92f..e82f4ec 100644 --- a/sort.c +++ b/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) -- cgit v1.1