Changeset f2460a50 in mainline for uspace/lib/posix/source/stdlib.c

Timestamp:

2017-05-30T06:16:25Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c726209

Parents:

719a208

Message:

qsort() compliant with C standard.

File:

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

uspace/lib/posix/source/stdlib.c

@@ -47 +47 @@
 #include "posix/unistd.h"
 
-#include "libc/sort.h"
+#include "libc/qsort.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.
  *
@@ -169 +146 @@
     int (*compare)(const void *, const void *))
 {
-        /* Implemented in libc with one extra argument. */
-        qsort(array, count, size, sort_compare_wrapper, compare);
+        qsort(array, count, size, compare);
 }