Changeset 95c675b in mainline for uspace/lib/ext4/src/directory_index.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

File:

• uspace/lib/ext4/src/directory_index.c (modified) (4 diffs)

uspace/lib/ext4/src/directory_index.c

@@ -38 +38 @@
 #include <errno.h>
 #include <mem.h>
-#include <sort.h>
 #include <stdlib.h>
 #include <str.h>
@@ -668 +667 @@
  * @param arg1  First entry
  * @param arg2  Second entry
- * @param dummy Unused parameter, can be NULL
  *
  * @return Classic compare result
@@ -674 +672 @@
  *
  */
-static int ext4_directory_dx_entry_comparator(void *arg1, void *arg2, void *dummy)
-{
-        ext4_dx_sort_entry_t *entry1 = arg1;
-        ext4_dx_sort_entry_t *entry2 = arg2;
+static int ext4_directory_dx_entry_comparator(const void *arg1,
+    const void *arg2)
+{
+        ext4_dx_sort_entry_t const *entry1 = arg1;
+        ext4_dx_sort_entry_t const *entry2 = arg2;
         
         if (entry1->hash == entry2->hash)
@@ -793 +792 @@
         /* Sort all entries */
         qsort(sort_array, idx, sizeof(ext4_dx_sort_entry_t),
-            ext4_directory_dx_entry_comparator, NULL);
+            ext4_directory_dx_entry_comparator);
         
         /* Allocate new block for store the second part of entries */