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

File:

• uspace/srv/bd/vbd/vbd.c (modified) (20 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>
@@ -56 +57 @@
 static service_id_t ctl_sid;
 
-static int vbds_init(void)
-{
-        int rc;
+static errno_t vbds_init(void)
+{
+        errno_t rc;
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_init()");
 
@@ -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;
         }
@@ -91 +92 @@
         size_t size;
         size_t act_size;
-        int rc;
+        errno_t rc;
 
         if (!async_data_read_receive(&callid, &size)) {
@@ -114 +115 @@
         }
 
-        sysarg_t retval = async_data_read_finalize(callid, id_buf, size);
+        errno_t retval = async_data_read_finalize(callid, id_buf, size);
         free(id_buf);
 
@@ -124 +125 @@
         service_id_t disk_sid;
         vbd_disk_info_t dinfo;
-        int rc;
+        errno_t rc;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_disk_info_srv()");
@@ -164 +165 @@
         service_id_t disk_sid;
         label_type_t ltype;
-        int rc;
+        errno_t rc;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_label_create_srv()");
@@ -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);
 }
 
@@ -177 +178 @@
 {
         service_id_t disk_sid;
-        int rc;
+        errno_t rc;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_label_delete_srv()");
@@ -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);
 }
 
@@ -192 +193 @@
         size_t act_size;
         service_id_t sid;
-        int rc;
+        errno_t rc;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_label_get_parts_srv()");
@@ -218 +219 @@
         }
 
-        sysarg_t retval = async_data_read_finalize(callid, id_buf, size);
+        errno_t retval = async_data_read_finalize(callid, id_buf, size);
         free(id_buf);
 
@@ -228 +229 @@
         vbds_part_id_t part;
         vbd_part_info_t pinfo;
-        int rc;
+        errno_t rc;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_part_get_info_srv()");
@@ -269 +270 @@
         vbd_part_spec_t pspec;
         vbds_part_id_t part;
-        int rc;
+        errno_t rc;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_part_create_srv()");
@@ -302 +303 @@
         }
 
-        async_answer_1(iid, (sysarg_t)rc, (sysarg_t)part);
+        async_answer_1(iid, rc, (sysarg_t)part);
 }
 
@@ -308 +309 @@
 {
         vbds_part_id_t part;
-        int rc;
+        errno_t rc;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_part_delete_srv()");
@@ -314 +315 @@
         part = IPC_GET_ARG1(*icall);
         rc = vbds_part_delete(part);
-        async_answer_0(iid, (sysarg_t) rc);
+        async_answer_0(iid, rc);
 }
 
@@ -322 +323 @@
         label_ptype_t ptype;
         label_pcnt_t pcnt;
-        int rc;
+        errno_t rc;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_suggest_ptype_srv()");
@@ -427 +428 @@
 int main(int argc, char *argv[])
 {
-        int rc;
+        errno_t rc;
 
         printf("%s: Virtual Block Device service\n", NAME);