Changeset f2460a50 in mainline for uspace/app/bdsh/cmds/modules/ls/ls.c

Timestamp:

2017-05-30T06:16:25Z (7 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/app/bdsh/cmds/modules/ls/ls.c (modified) (4 diffs)

uspace/app/bdsh/cmds/modules/ls/ls.c

@@ -39 +39 @@
 #include <vfs/vfs.h>
 #include <str.h>
-#include <sort.h>
 
 #include "ls.h"
@@ -62 +61 @@
 static unsigned int ls_start(ls_job_t *);
 static void ls_print(struct dir_elem_t *);
-static int ls_cmp(void *, void *, void *);
+static int ls_cmp(const void *, const void *);
 static signed int ls_scan_dir(const char *, DIR *, struct dir_elem_t **);
 static unsigned int ls_recursive(const char *, DIR *);
@@ -104 +103 @@
  * @param a             Pointer to the structure of the first element.
  * @param b             Pointer to the structure of the second element.
- * @param arg           Pointer for an other and optionnal argument.
  *
  * @return              -1 if a < b, 1 otherwise.
  */
-static int ls_cmp(void *a, void *b, void *arg)
-{
-        struct dir_elem_t *da = a;
-        struct dir_elem_t *db = b;
+static int ls_cmp(const void *a, const void *b)
+{
+        struct dir_elem_t const *da = a;
+        struct dir_elem_t const *db = b;
         
         if ((da->s.is_directory && db->s.is_file) ||
@@ -191 +189 @@
         }
         
-        if (ls.sort) {
-                if (!qsort(&tosort[0], nbdirs, sizeof(struct dir_elem_t),
-                    ls_cmp, NULL)) {
-                        printf("Sorting error.\n");
-                }
-        }
+        if (ls.sort)
+                qsort(&tosort[0], nbdirs, sizeof(struct dir_elem_t), ls_cmp);
         
         for (i = 0; i < nbdirs; i++)