xnu-1228.9.59.tar.gz

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

diff --git a/bsd/kern/qsort.c b/bsd/kern/qsort.c
index e9816022de91ac3f20c6423fcea794c3bbb3ce6c..8910df65ea22ce0f2d4f6d84693191d893b6ba46 100644 (file)
--- a/bsd/kern/qsort.c
+++ b/bsd/kern/qsort.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -65,8 +65,9 @@
 
 #include <sys/types.h>
 //#include <stdlib.h>
 
 #include <sys/types.h>
 //#include <stdlib.h>

+#include <libsa/stdlib.h>      /* qsort() */

 
 

-static inline char     *med3(char *, char *, char *, int (*)());
+static inline char     *med3(char *, char *, char *, int (*)(const void *, const void *));

 static inline void      swapfunc(char *, char *, int, int);
 
 #define min(a, b)      (a) < (b) ? a : b
 static inline void      swapfunc(char *, char *, int, int);
 
 #define min(a, b)      (a) < (b) ? a : b


@@ -76,10 +77,10 @@ static inline void   swapfunc(char *, char *, int, int);
  */
 #define swapcode(TYPE, parmi, parmj, n) {              \
        long i = (n) / sizeof (TYPE);                   \
  */
 #define swapcode(TYPE, parmi, parmj, n) {              \
        long i = (n) / sizeof (TYPE);                   \

-       register TYPE *pi = (TYPE *) (parmi);           \
-       register TYPE *pj = (TYPE *) (parmj);           \
+       TYPE *pi = (TYPE *) (parmi);                    \
+       TYPE *pj = (TYPE *) (parmj);                    \

        do {                                            \
        do {                                            \

-               register TYPE   t = *pi;                \
+               TYPE    t = *pi;                        \

                *pi++ = *pj;                            \
                *pj++ = t;                              \
         } while (--i > 0);                             \
                *pi++ = *pj;                            \
                *pj++ = t;                              \
         } while (--i > 0);                             \


@@ -89,9 +90,7 @@ static inline void     swapfunc(char *, char *, int, int);
        es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
 
 static inline void
        es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
 
 static inline void

-swapfunc(a, b, n, swaptype)
-       char *a, *b;
-       int n, swaptype;
+swapfunc(char *a, char *b, int n, int swaptype)

 {
        if(swaptype <= 1) 
                swapcode(long, a, b, n)
 {
        if(swaptype <= 1) 
                swapcode(long, a, b, n)


@@ -110,9 +109,7 @@ swapfunc(a, b, n, swaptype)
 #define vecswap(a, b, n)       if ((n) > 0) swapfunc(a, b, n, swaptype)
 
 static inline char *
 #define vecswap(a, b, n)       if ((n) > 0) swapfunc(a, b, n, swaptype)
 
 static inline char *

-med3(a, b, c, cmp)
-       char *a, *b, *c;
-       int (*cmp)();
+med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *))

 {
        return cmp(a, b) < 0 ?
               (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a ))
 {
        return cmp(a, b) < 0 ?
               (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a ))


@@ -121,13 +118,11 @@ med3(a, b, c, cmp)
 
 __private_extern__
 void
 
 __private_extern__
 void

-qsort(a, n, es, cmp)
-       void *a;
-       size_t n, es;
-       int (*cmp)();
+qsort(void *a, size_t n, size_t es, int (*cmp)(const void *, const void *))

 {
        char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
 {
        char *pa, *pb, *pc, *pd, *pl, *pm, *pn;

-       int d, r, swaptype, swap_cnt;
+       int d, swaptype, swap_cnt;
+       int r;

 
 loop:  SWAPINIT(a, es);
        swap_cnt = 0;
 
 loop:  SWAPINIT(a, es);
        swap_cnt = 0;


@@ -189,11 +184,11 @@ loop:     SWAPINIT(a, es);
        pn = (char *)a + n * es;
        r = min(pa - (char *)a, pb - pa);
        vecswap(a, pb - r, r);
        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((size_t)(pd - pc), pn - pd - es);

        vecswap(pb, pn - r, r);
        vecswap(pb, pn - r, r);

-       if ((r = pb - pa) > es)
+       if ((size_t)(r = pb - pa) > es)

                qsort(a, r / es, es, cmp);
                qsort(a, r / es, es, cmp);

-       if ((r = pd - pc) > es) { 
+       if ((size_t)(r = pd - pc) > es) { 

                /* Iterate rather than recurse to save stack space */
                a = pn - r;
                n = r / es;
                /* Iterate rather than recurse to save stack space */
                a = pn - r;
                n = r / es;