Changeset ff381a7 in mainline for uspace/srv/devman/match.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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/match.c (modified) (3 diffs)

uspace/srv/devman/match.c

@@ -31 +31 @@
  */
 
+#include <errno.h>
 #include <fcntl.h>
 #include <io/log.h>
@@ -197 +198 @@
         if (fd < 0) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to open `%s' for reading: %s.",
-                    conf_path, str_error(fd));
+                    conf_path, str_error(errno));
                 goto cleanup;
         }
@@ -217 +218 @@
         }
         
-        ssize_t read_bytes = read_all(fd, buf, len);
+        ssize_t read_bytes = read(fd, buf, len);
         if (read_bytes <= 0) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to read file '%s' (%zd).", conf_path,
-                    read_bytes);
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to read file '%s' (%d).", conf_path,
+                    errno);
                 goto cleanup;
         }