Changeset 5c769d54 in mainline for uspace/app/devctl/devctl.c

Timestamp:

2017-09-22T17:06:08Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd1745f

Parents:

207d5da

Message:

devctl list-drv can use io/table.

File:

• uspace/app/devctl/devctl.c (modified) (4 diffs)

uspace/app/devctl/devctl.c

@@ -35 +35 @@
 #include <devman.h>
 #include <errno.h>
+#include <io/table.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -205 +206 @@
         size_t ndevs;
         size_t i;
+        table_t *table = NULL;
         int rc;
 
@@ -210 +212 @@
         if (rc != EOK)
                 return rc;
+
+        rc = table_create(&table);
+        if (rc != EOK) {
+                assert(rc == ENOMEM);
+                goto out;
+        }
+
+        table_header_row(table);
+        table_printf(table, "Driver\t" "Devs\t" "State\n");
 
         for (i = 0; i < ndrvs; i++) {
@@ -226 +237 @@
                 sstate = drv_state_str(state);
 
-                printf("%-11s %3zu %s\n", sstate, ndevs, drv_name);
+                table_printf(table, "%s\t" "%zu\t" "%s\n", drv_name, ndevs, sstate);
 skip:
                 free(devs);
         }
+
+        rc = table_print_out(table, stdout);
+        if (rc != EOK)
+                printf("Error printing driver table.\n");
+out:
         free(drvs);
-
-        return EOK;
+        table_destroy(table);
+
+        return rc;
 }