forked from len0rd/rockbox
Killed a few warnings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@913 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
6b918cf54d
commit
9ce7831193
1 changed files with 6 additions and 6 deletions
|
|
@ -81,7 +81,7 @@ PORTABILITY
|
|||
#define inline
|
||||
#endif
|
||||
|
||||
static inline char *med3 _PARAMS((char *, char *, char *, int (*)()));
|
||||
static inline char *med3 _PARAMS((char *, char *, char *, int (*cmp)(const _PTR,const _PTR)));
|
||||
static inline void swapfunc _PARAMS((char *, char *, int, int));
|
||||
|
||||
#define min(a, b) (a) < (b) ? a : b
|
||||
|
|
@ -131,7 +131,7 @@ _DEFUN(med3, (a, b, c, cmp),
|
|||
char *a _AND
|
||||
char *b _AND
|
||||
char *c _AND
|
||||
int (*cmp)())
|
||||
int (*cmp)(const _PTR,const _PTR))
|
||||
{
|
||||
return cmp(a, b) < 0 ?
|
||||
(cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a ))
|
||||
|
|
@ -143,7 +143,7 @@ _DEFUN(qsort, (a, n, es, cmp),
|
|||
void *a _AND
|
||||
size_t n _AND
|
||||
size_t es _AND
|
||||
int (*cmp)())
|
||||
int (*cmp)(const _PTR,const _PTR))
|
||||
{
|
||||
char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
|
||||
int d, r, swaptype, swap_cnt;
|
||||
|
|
@ -208,11 +208,11 @@ loop: SWAPINIT(a, es);
|
|||
pn = (char *) a + n * es;
|
||||
r = min(pa - (char *)a, pb - pa);
|
||||
vecswap(a, pb - r, r);
|
||||
r = min(pd - pc, pn - pd - es);
|
||||
r = min((unsigned int)(pd - pc), pn - pd - es);
|
||||
vecswap(pb, pn - r, r);
|
||||
if ((r = pb - pa) > es)
|
||||
if ((unsigned int)(r = pb - pa) > es)
|
||||
qsort(a, r / es, es, cmp);
|
||||
if ((r = pd - pc) > es) {
|
||||
if ((unsigned int)(r = pd - pc) > es) {
|
||||
/* Iterate rather than recurse to save stack space */
|
||||
a = pn - r;
|
||||
n = r / es;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue