X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffs_qsort.c;fp=direct%2Fyaffs_qsort.c;h=afd1ffa799ead0a2d197b0a5f42f4e99a81ca3a1;hp=187519fbdb55c824184d4be0a30fd53444562def;hb=07353dd87a46afc753441028af8f5e8629b13bdc;hpb=1658295946bc589b4d351e75a59bd697630cd9e1 diff --git a/direct/yaffs_qsort.c b/direct/yaffs_qsort.c index 187519f..afd1ffa 100644 --- a/direct/yaffs_qsort.c +++ b/direct/yaffs_qsort.c @@ -33,11 +33,11 @@ /* * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function". */ -#define swapcode(TYPE, parmi, parmj, n) do { \ - long i = (n) / sizeof (TYPE); \ - register TYPE *pi = (TYPE *) (parmi); \ - register TYPE *pj = (TYPE *) (parmj); \ - do { \ +#define swapcode(TYPE, parmi, parmj, n) do { \ + long i = (n) / sizeof(TYPE); \ + register TYPE *pi = (TYPE *) (parmi); \ + register TYPE *pj = (TYPE *) (parmj); \ + do { \ register TYPE t = *pi; \ *pi++ = *pj; \ *pj++ = t; \ @@ -47,7 +47,7 @@ #define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \ es % sizeof(long) ? 2 : es == sizeof(long) ? 0 : 1; -static __inline void +static inline void swapfunc(char *a, char *b, int n, int swaptype) { if (swaptype <= 1) @@ -65,9 +65,9 @@ swapfunc(char *a, char *b, int n, int swaptype) swapfunc(a, b, es, swaptype); \ } while (0) -#define vecswap(a, b, n) if ((n) > 0) swapfunc(a, b, n, swaptype) +#define vecswap(a, b, n) if ((n) > 0) swapfunc(a, b, n, swaptype) -static __inline char * +static inline char * med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *)) { return cmp(a, b) < 0 ?