Changeset 86ffa27f in mainline for uspace/srv/devman/devman.c

Timestamp:

2011-08-07T11:21:44Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cc574511

Parents:

15f3c3f (diff), e8067c0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/srv/devman/devman.c

@@ -270 +270 @@
         }
         
-        ssize_t read_bytes = safe_read(fd, buf, len);
+        ssize_t read_bytes = read_all(fd, buf, len);
         if (read_bytes <= 0) {
-                log_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path);
+                log_msg(LVL_ERROR, "Unable to read file '%s' (%zd).", conf_path,
+                    read_bytes);
                 goto cleanup;
         }
@@ -421 +422 @@
         }
         
-        insert_fun_node(tree, fun, clone_string(""), NULL);
+        insert_fun_node(tree, fun, str_dup(""), NULL);
         match_id_t *id = create_match_id();
-        id->id = clone_string("root");
+        id->id = str_dup("root");
         id->score = 100;
         add_match_id(&fun->match_ids, id);