xnu-517.9.5.tar.gz

[apple/xnu.git] / bsd / kern / qsort.c

diff --git a/bsd/kern/qsort.c b/bsd/kern/qsort.c
index 6ccb0411212622f9184f789853a414dc4dcb3b99..7eeb4e40865cd125024b74f62cbab5b9b97d91db 100644 (file)
--- a/bsd/kern/qsort.c
+++ b/bsd/kern/qsort.c
@@ -58,7 +58,7 @@
 
 
 #include <sys/types.h>
 
 
 #include <sys/types.h>

-#include <stdlib.h>
+//#include <stdlib.h>

 
 static inline char     *med3 __P((char *, char *, char *, int (*)()));
 static inline void      swapfunc __P((char *, char *, int, int));
 
 static inline char     *med3 __P((char *, char *, char *, int (*)()));
 static inline void      swapfunc __P((char *, char *, int, int));


@@ -113,6 +113,7 @@ med3(a, b, c, cmp)
               :(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c ));
 }
 
               :(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c ));
 }
 

+__private_extern__

 void
 qsort(a, n, es, cmp)
        void *a;
 void
 qsort(a, n, es, cmp)
        void *a;


@@ -125,16 +126,16 @@ qsort(a, n, es, cmp)
 loop:  SWAPINIT(a, es);
        swap_cnt = 0;
        if (n < 7) {
 loop:  SWAPINIT(a, es);
        swap_cnt = 0;
        if (n < 7) {

-               for (pm = a + es; pm < (char *) a + n * es; pm += es)
+               for (pm = (char *)a + es; pm < (char *) a + n * es; pm += es)

                        for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
                             pl -= es)
                                swap(pl, pl - es);
                return;
        }
                        for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
                             pl -= es)
                                swap(pl, pl - es);
                return;
        }

-       pm = a + (n / 2) * es;
+       pm = (char *)a + (n / 2) * es;

        if (n > 7) {
                pl = a;
        if (n > 7) {
                pl = a;

-               pn = a + (n - 1) * es;
+               pn = (char *)a + (n - 1) * es;

                if (n > 40) {
                        d = (n / 8) * es;
                        pl = med3(pl, pl + d, pl + 2 * d, cmp);
                if (n > 40) {
                        d = (n / 8) * es;
                        pl = med3(pl, pl + d, pl + 2 * d, cmp);


@@ -144,9 +145,9 @@ loop:       SWAPINIT(a, es);
                pm = med3(pl, pm, pn, cmp);
        }
        swap(a, pm);
                pm = med3(pl, pm, pn, cmp);
        }
        swap(a, pm);

-       pa = pb = a + es;
+       pa = pb = (char *)a + es;

 
 

-       pc = pd = a + (n - 1) * es;
+       pc = pd = (char *)a + (n - 1) * es;

        for (;;) {
                while (pb <= pc && (r = cmp(pb, a)) <= 0) {
                        if (r == 0) {
        for (;;) {
                while (pb <= pc && (r = cmp(pb, a)) <= 0) {
                        if (r == 0) {


@@ -172,14 +173,14 @@ loop:     SWAPINIT(a, es);
                pc -= es;
        }
        if (swap_cnt == 0) {  /* Switch to insertion sort */
                pc -= es;
        }
        if (swap_cnt == 0) {  /* Switch to insertion sort */

-               for (pm = a + es; pm < (char *) a + n * es; pm += es)
+               for (pm = (char *)a + es; pm < (char *) a + n * es; pm += es)

                        for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0; 
                             pl -= es)
                                swap(pl, pl - es);
                return;
        }
 
                        for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0; 
                             pl -= es)
                                swap(pl, pl - es);
                return;
        }
 

-       pn = a + n * 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(pa - (char *)a, pb - pa);
        vecswap(a, pb - r, r);
        r = min(pd - pc, pn - pd - es);