Changes in uspace/srv/bd/vbd/vbd.c [25a179e:5772aa1] in mainline

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