Changeset 132ab5d1 in mainline for uspace/srv/bd/vbd/disk.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/srv/bd/vbd/disk.c (modified) (4 diffs)

uspace/srv/bd/vbd/disk.c

@@ -38 +38 @@
 #include <block.h>
 #include <errno.h>
+#include <str_error.h>
 #include <io/log.h>
 #include <label/empty.h>
@@ -456 +457 @@
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering callback "
-                    "for disk discovery (%d).", rc);
+                    "for disk discovery: %s.", str_error(rc));
                 return rc;
         }
@@ -1113 +1114 @@
         idx = part->lpart->index;
 
-        rc = asprintf(&name, "%sp%u", part->disk->svc_name, idx);
-        if (rc < 0) {
+        if (asprintf(&name, "%sp%u", part->disk->svc_name, idx) < 0) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Out of memory.");
                 return ENOMEM;
@@ -1124 +1124 @@
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering "
-                    "service %s (%d).", name, rc);
+                    "service %s: %s.", name, str_error(rc));
                 free(name);
                 free(part);