Changes in uspace/srv/devman/devman.c [df147c7:8b1e15ac] in mainline

File:

• uspace/srv/devman/devman.c (modified) (4 diffs)

uspace/srv/devman/devman.c

@@ -266 +266 @@
         }
         
-        ssize_t read_bytes = safe_read(fd, buf, len);
-        if (read_bytes <= 0) {
+        if (read(fd, buf, len) <= 0) {
                 printf(NAME ": unable to read file '%s'.\n", conf_path);
                 goto cleanup;
         }
-        buf[read_bytes] = 0;
+        buf[len] = 0;
         
         suc = parse_match_ids(buf, ids);
@@ -1124 +1123 @@
 fun_node_t *find_fun_node_by_path(dev_tree_t *tree, char *path)
 {
-        assert(path != NULL);
-
-        bool is_absolute = path[0] == '/';
-        if (!is_absolute) {
-                return NULL;
-        }
-
         fibril_rwlock_read_lock(&tree->rwlock);
         
@@ -1140 +1132 @@
         char *rel_path = path;
         char *next_path_elem = NULL;
-        bool cont = true;
+        bool cont = (rel_path[0] == '/');
         
         while (cont && fun != NULL) {
@@ -1223 +1215 @@
         if (info != NULL) {
                 memset(info, 0, sizeof(dev_class_info_t));
-                link_initialize(&info->dev_classes);
-                link_initialize(&info->devmap_link);
-                link_initialize(&info->link);
+                list_initialize(&info->dev_classes);
+                list_initialize(&info->devmap_link);
+                list_initialize(&info->link);
         }