Changeset 132ab5d1 in mainline for uspace/srv/bd/vbd/vbd.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/vbd.c (modified) (9 diffs)

uspace/srv/bd/vbd/vbd.c

@@ -36 +36 @@
 #include <async.h>
 #include <errno.h>
+#include <str_error.h>
 #include <io/log.h>
 #include <ipc/services.h>
@@ -69 +70 @@
         rc = loc_server_register(NAME);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server (%d).", rc);
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server: %s.", str_error(rc));
                 return EEXIST;
         }
@@ -75 +76 @@
         rc = loc_service_register(SERVICE_NAME_VBD, &ctl_sid);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc);
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service: %s.", str_error(rc));
                 return EEXIST;
         }
@@ -114 +115 @@
         }
 
-        sysarg_t retval = async_data_read_finalize(callid, id_buf, size);
+        int retval = async_data_read_finalize(callid, id_buf, size);
         free(id_buf);
 
@@ -171 +172 @@
         ltype = IPC_GET_ARG2(*icall);
         rc = vbds_label_create(disk_sid, ltype);
-        async_answer_0(iid, (sysarg_t) rc);
+        async_answer_0(iid, rc);
 }
 
@@ -183 +184 @@
         disk_sid = IPC_GET_ARG1(*icall);
         rc = vbds_label_delete(disk_sid);
-        async_answer_0(iid, (sysarg_t) rc);
+        async_answer_0(iid, rc);
 }
 
@@ -218 +219 @@
         }
 
-        sysarg_t retval = async_data_read_finalize(callid, id_buf, size);
+        int retval = async_data_read_finalize(callid, id_buf, size);
         free(id_buf);
 
@@ -302 +303 @@
         }
 
-        async_answer_1(iid, (sysarg_t)rc, (sysarg_t)part);
+        async_answer_1(iid, rc, (sysarg_t)part);
 }
 
@@ -314 +315 @@
         part = IPC_GET_ARG1(*icall);
         rc = vbds_part_delete(part);
-        async_answer_0(iid, (sysarg_t) rc);
+        async_answer_0(iid, rc);
 }