xnu-4570.41.2.tar.gz

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

diff --git a/bsd/kern/qsort.c b/bsd/kern/qsort.c
index 9ac15c01ba3d62e7b8d09943250eab7deb2b1d4e..cfa58910a481fdbcb753a93675450ed8fa404145 100644 (file)
--- a/bsd/kern/qsort.c
+++ b/bsd/kern/qsort.c
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved
@@ -59,8 +65,13 @@
 
 #include <sys/types.h>
 //#include <stdlib.h>
+#include <sys/kpi_private.h>
+
+__private_extern__
+void
+qsort(void *a, size_t n, size_t es, int (*cmp)(const void *, const void *));
 
-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
@@ -70,10 +81,10 @@ static inline void   swapfunc(char *, char *, int, int);
  */
 #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 {                                            \
-               register TYPE   t = *pi;                \
+               TYPE    t = *pi;                        \
                *pi++ = *pj;                            \
                *pj++ = t;                              \
         } while (--i > 0);                             \
@@ -83,9 +94,7 @@ static inline void     swapfunc(char *, char *, int, int);
        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)
@@ -104,9 +113,7 @@ swapfunc(a, b, n, swaptype)
 #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 ))
@@ -115,13 +122,11 @@ med3(a, b, c, cmp)
 
 __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;
-       int d, r, swaptype, swap_cnt;
+       int d, swaptype, swap_cnt;
+       int r;
 
 loop:  SWAPINIT(a, es);
        swap_cnt = 0;
@@ -183,11 +188,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((size_t)(pd - pc), pn - pd - es);
        vecswap(pb, pn - r, r);
-       if ((r = pb - pa) > es)
+       if ((size_t)(r = pb - pa) > es)
                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;
@@ -195,3 +200,9 @@ loop:       SWAPINIT(a, es);
        }
 /*             qsort(pn - r, r / es, es, cmp);*/
 }
+
+/* private KPI */
+void 
+kx_qsort (void *array, size_t nm, size_t member_size, int (*cmpf)(const void *, const void *)) {
+       qsort (array, nm, member_size, cmpf);
+}