Changes in uspace/app/devctl/devctl.c [ce1df04:1a5b252] in mainline

File:

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

uspace/app/devctl/devctl.c

@@ -44 +44 @@
 #define MAX_NAME_LENGTH 1024
 
-char name[MAX_NAME_LENGTH];
-char drv_name[MAX_NAME_LENGTH];
-
 static int fun_subtree_print(devman_handle_t funh, int lvl)
 {
+        char name[MAX_NAME_LENGTH];
         devman_handle_t devh;
         devman_handle_t *cfuns;
@@ -59 +57 @@
 
         rc = devman_fun_get_name(funh, name, MAX_NAME_LENGTH);
-        if (rc != EOK)
-                return ELIMIT;
+        if (rc != EOK) {
+                str_cpy(name, MAX_NAME_LENGTH, "unknown");
+                return ENOMEM;
+        }
 
         if (name[0] == '\0')
                 str_cpy(name, MAX_NAME_LENGTH, "/");
 
-        rc = devman_fun_get_driver_name(funh, drv_name, MAX_NAME_LENGTH);
-        if (rc != EOK && rc != EINVAL)
-                return ELIMIT;
-
-        if (rc == EINVAL)
-                printf("%s\n", name);
-        else
-                printf("%s : %s\n", name, drv_name);
+        printf("%s (%" PRIun ")\n", name, funh);
 
         rc = devman_fun_get_child(funh, &devh);
@@ -151 +144 @@
         rc = devman_fun_offline(funh);
         if (rc != EOK) {
-                printf(NAME ": Failed to offline function '%s' (%s)\n", path,
-                    str_error(rc));
+                printf(NAME ": Failed to offline function '%s'.\n", path);
                 return rc;
         }