Changeset 0feb39b in mainline

Timestamp:

2019-06-01T12:32:46Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

4a764d1

Parents:

f4f4b95

Message:

Correcting return type for printer function

Instead of returning a bool indicating a string, the
printer function in the command returns now an errno_t

Location:

uspace/app/bdsh/cmds/modules/ls

Files:

• ls.c (modified) (8 diffs)
• ls.h (modified) (1 diff)

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

@@ -66 +66 @@
 /* Prototypes for the ls command, excluding entry points. */
 static unsigned int ls_start(ls_job_t *);
-static bool ls_print(struct dir_elem_t *);
-static bool ls_print_single_column(struct dir_elem_t *);
+static errno_t ls_print(struct dir_elem_t *);
+static errno_t ls_print_single_column(struct dir_elem_t *);
 static int ls_cmp_type_name(const void *, const void *);
 static int ls_cmp_name(const void *, const void *);
@@ -96 +96 @@
  * @param de            Directory element.
  */
-static bool ls_print(struct dir_elem_t *de)
+static errno_t ls_print(struct dir_elem_t *de)
 {
         int width = 13;
@@ -110 +110 @@
 
                         char *rptr;
-                        if (cap_format(&cap, &rptr) == EOK) {
+                        errno_t rc = cap_format(&cap, &rptr);
+                        if (rc == EOK) {
                                 char bytes[9], suffix[3];
                                 sscanf(rptr, "%s %s", bytes, suffix);
@@ -117 +118 @@
                                 printf("%-40s\t%*s %2s\n", de->name, width - 3, bytes, suffix);
                         } else
-                                return false;
+                                return rc;
                 }
         } else if (de->s.is_directory)
@@ -124 +125 @@
                 printf("%-40s\n", de->name);
 
-        return true;
-}
-
-static bool ls_print_single_column(struct dir_elem_t *de)
+        return EOK;
+}
+
+static errno_t ls_print_single_column(struct dir_elem_t *de)
 {
         if (de->s.is_file) {
@@ -135 +136 @@
         }
 
-        return true;
+        return EOK;
 }
 
@@ -253 +254 @@
 
         for (i = 0; i < nbdirs; i++) {
-                if (!ls.printer(&tosort[i])) {
+                if (ls.printer(&tosort[i]) != EOK) {
                         cli_error(CL_ENOMEM, "%s: Out of memory", cmdname);
                         goto out;
@@ -470 +471 @@
         switch (scope) {
         case LS_FILE:
-                if (!ls.printer(&de)) {
+                if (ls.printer(&de) != EOK) {
                         cli_error(CL_ENOMEM, "%s: Out of memory", cmdname);
                         return CMD_FAILURE;

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

@@ -27 +27 @@
         bool exact_size;
 
-        bool (*printer)(struct dir_elem_t *);
+        errno_t (*printer)(struct dir_elem_t *);
 } ls_job_t;