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.
This commit is contained in:
Franklin Wei
2024-07-21 18:33:01 -04:00
committed by Simon Tatham
parent 5de69c22b0
commit a2f7f962ce
4 changed files with 16 additions and 21 deletions

20
sort.c
View File

@ -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)