Changes in uspace/srv/bd/vbd/disk.c [d5c1051:5772aa1] in mainline

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>
@@ -457 +456 @@
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering callback "
-                    "for disk discovery: %s.", str_error(rc));
+                    "for disk discovery (%d).", rc);
                 return rc;
         }
@@ -1114 +1113 @@
         idx = part->lpart->index;
 
-        if (asprintf(&name, "%sp%u", part->disk->svc_name, idx) < 0) {
+        rc = asprintf(&name, "%sp%u", part->disk->svc_name, idx);
+        if (rc < 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: %s.", name, str_error(rc));
+                    "service %s (%d).", name, rc);
                 free(name);
                 free(part);