Changes in uspace/lib/posix/source/stdlib.c [f2460a50:b19e892] in mainline

File:

• uspace/lib/posix/source/stdlib.c (modified) (3 diffs)

uspace/lib/posix/source/stdlib.c

@@ -47 +47 @@
 #include "posix/unistd.h"
 
-#include "libc/qsort.h"
+#include "libc/sort.h"
 #include "libc/str.h"
 #include "libc/vfs/vfs.h"
@@ -136 +136 @@
 
 /**
+ * Private helper function that serves as a compare function for qsort().
+ *
+ * @param elem1 First element to compare.
+ * @param elem2 Second element to compare.
+ * @param compare Comparison function without userdata parameter.
+ * @return Relative ordering of the elements.
+ */
+static int sort_compare_wrapper(void *elem1, void *elem2, void *userdata)
+{
+        int (*compare)(const void *, const void *) = userdata;
+        int ret = compare(elem1, elem2);
+        
+        /* Native qsort internals expect this. */
+        if (ret < 0) {
+                return -1;
+        } else if (ret > 0) {
+                return 1;
+        } else {
+                return 0;
+        }
+}
+
+/**
  * Array sorting utilizing the quicksort algorithm.
  *
@@ -146 +169 @@
     int (*compare)(const void *, const void *))
 {
-        qsort(array, count, size, compare);
+        /* Implemented in libc with one extra argument. */
+        qsort(array, count, size, sort_compare_wrapper, compare);
 }