Changes in uspace/app/devctl/devctl.c [81685dd9:1d6dd2a] in mainline

File:

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

uspace/app/devctl/devctl.c

@@ -39 +39 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 #include <str_error.h>
 
@@ -70 +71 @@
 }
 
-static int fun_subtree_print(devman_handle_t funh, int lvl)
+static errno_t fun_subtree_print(devman_handle_t funh, int lvl)
 {
         devman_handle_t devh;
@@ -76 +77 @@
         size_t count, i;
         unsigned int score;
-        int rc;
+        errno_t rc;
         int j;
 
@@ -136 +137 @@
 }
 
-static int fun_tree_print(void)
+static errno_t fun_tree_print(void)
 {
         devman_handle_t root_fun;
-        int rc;
+        errno_t rc;
 
         rc = devman_fun_get_handle("/", &root_fun, 0);
@@ -154 +155 @@
 }
 
-static int fun_online(const char *path)
+static errno_t fun_online(const char *path)
 {
         devman_handle_t funh;
-        int rc;
+        errno_t rc;
 
         rc = devman_fun_get_handle(path, &funh, 0);
@@ -175 +176 @@
 }
 
-static int fun_offline(const char *path)
+static errno_t fun_offline(const char *path)
 {
         devman_handle_t funh;
-        int rc;
+        errno_t rc;
 
         rc = devman_fun_get_handle(path, &funh, 0);
@@ -197 +198 @@
 }
 
-static int drv_list(void)
+static errno_t drv_list(void)
 {
         devman_handle_t *devs;
@@ -207 +208 @@
         size_t i;
         table_t *table = NULL;
-        int rc;
+        errno_t rc;
 
         rc = devman_get_drivers(&drvs, &ndrvs);
@@ -252 +253 @@
 }
 
-static int drv_show(char *drvname)
+static errno_t drv_show(char *drvname)
 {
         devman_handle_t *devs;
@@ -262 +263 @@
         size_t ndevs;
         size_t i;
-        int rc;
+        errno_t rc;
 
         rc = devman_driver_get_handle(drvname, &drvh);
@@ -317 +318 @@
 }
 
-static int drv_load(const char *drvname)
-{
-        int rc;
+static errno_t drv_load(const char *drvname)
+{
+        errno_t rc;
         devman_handle_t drvh;
 
         rc = devman_driver_get_handle(drvname, &drvh);
         if (rc != EOK) {
-                printf("Failed resolving driver '%s' (%d).\n", drvname, rc);
+                printf("Failed resolving driver '%s': %s.\n", drvname, str_error(rc));
                 return rc;
         }
@@ -330 +331 @@
         rc = devman_driver_load(drvh);
         if (rc != EOK) {
-                printf("Failed loading driver '%s' (%d).\n", drvname, rc);
-                return rc;
-        }
-
-        return EOK;
-}
-
-static int drv_unload(const char *drvname)
-{
-        int rc;
+                printf("Failed loading driver '%s': %s.\n", drvname, str_error(rc));
+                return rc;
+        }
+
+        return EOK;
+}
+
+static errno_t drv_unload(const char *drvname)
+{
+        errno_t rc;
         devman_handle_t drvh;
 
         rc = devman_driver_get_handle(drvname, &drvh);
         if (rc != EOK) {
-                printf("Failed resolving driver '%s' (%d).\n", drvname, rc);
+                printf("Failed resolving driver '%s': %s.\n", drvname, str_error(rc));
                 return rc;
         }
@@ -350 +351 @@
         rc = devman_driver_unload(drvh);
         if (rc != EOK) {
-                printf("Failed unloading driver '%s' (%d).\n", drvname, rc);
+                printf("Failed unloading driver '%s': %s.\n", drvname, str_error(rc));
                 return rc;
         }
@@ -371 +372 @@
 int main(int argc, char *argv[])
 {
-        int rc;
+        errno_t rc;
 
         if (argc == 1 || argv[1][0] == '-') {