Changes in uspace/srv/volsrv/part.c [9c2c7d2:b7fd2a0] in mainline

File:

• uspace/srv/volsrv/part.c (modified) (16 diffs)

uspace/srv/volsrv/part.c

@@ -37 +37 @@
 #include <stdbool.h>
 #include <errno.h>
+#include <str_error.h>
 #include <fibril_synch.h>
 #include <io/log.h>
@@ -49 +50 @@
 #include "types/part.h"
 
-static int vol_part_add_locked(service_id_t);
+static errno_t vol_part_add_locked(service_id_t);
 static LIST_INITIALIZE(vol_parts); /* of vol_part_t */
 static FIBRIL_MUTEX_INITIALIZE(vol_parts_lock);
@@ -68 +69 @@
 
 /** Check for new partitions */
-static int vol_part_check_new(void)
+static errno_t vol_part_check_new(void)
 {
         bool already_known;
@@ -74 +75 @@
         service_id_t *svcs;
         size_t count, i;
-        int rc;
+        errno_t rc;
 
         fibril_mutex_lock(&vol_parts_lock);
@@ -143 +144 @@
 }
 
-static int vol_part_probe(vol_part_t *part)
+static errno_t vol_part_probe(vol_part_t *part)
 {
         bool empty;
@@ -149 +150 @@
         struct fsname_type *fst;
         char *label;
-        int rc;
+        errno_t rc;
 
         log_msg(LOG_DEFAULT, LVL_NOTE, "Probe partition %s", part->svc_name);
@@ -203 +204 @@
 }
 
-static int vol_part_add_locked(service_id_t sid)
+static errno_t vol_part_add_locked(service_id_t sid)
 {
         vol_part_t *part;
-        int rc;
+        errno_t rc;
 
         assert(fibril_mutex_is_locked(&vol_parts_lock));
@@ -243 +244 @@
 }
 
-int vol_part_add(service_id_t sid)
-{
-        int rc;
+errno_t vol_part_add(service_id_t sid)
+{
+        errno_t rc;
 
         fibril_mutex_lock(&vol_parts_lock);
@@ -259 +260 @@
 }
 
-int vol_part_init(void)
-{
-        return EOK;
-}
-
-int vol_part_discovery_start(void)
-{
-        int rc;
+errno_t vol_part_init(void)
+{
+        return EOK;
+}
+
+errno_t vol_part_discovery_start(void)
+{
+        errno_t rc;
 
         rc = loc_register_cat_change_cb(vol_part_cat_change_cb);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering callback "
-                    "for partition discovery (%d).", rc);
+                    "for partition discovery: %s.", str_error(rc));
                 return rc;
         }
@@ -279 +280 @@
 
 /** Get list of partitions as array of service IDs. */
-int vol_part_get_ids(service_id_t *id_buf, size_t buf_size, size_t *act_size)
+errno_t vol_part_get_ids(service_id_t *id_buf, size_t buf_size, size_t *act_size)
 {
         size_t act_cnt;
@@ -307 +308 @@
 }
 
-int vol_part_find_by_id(service_id_t sid, vol_part_t **rpart)
+errno_t vol_part_find_by_id(service_id_t sid, vol_part_t **rpart)
 {
         list_foreach(vol_parts, lparts, vol_part_t, part) {
@@ -320 +321 @@
 }
 
-int vol_part_empty_part(vol_part_t *part)
-{
-        int rc;
+errno_t vol_part_empty_part(vol_part_t *part)
+{
+        errno_t rc;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_empty_part()");
@@ -328 +329 @@
         rc = volsrv_part_empty(part->svc_id);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_empty_part() - failed %d",
-                    rc);
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_empty_part() - failed %s",
+                    str_error(rc));
                 return rc;
         }
@@ -337 +338 @@
 }
 
-int vol_part_mkfs_part(vol_part_t *part, vol_fstype_t fstype,
+errno_t vol_part_mkfs_part(vol_part_t *part, vol_fstype_t fstype,
     const char *label)
 {
-        int rc;
+        errno_t rc;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_mkfs_part()");
@@ -348 +349 @@
         rc = volsrv_part_mkfs(part->svc_id, fstype, label);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_mkfs_part() - failed %d",
-                    rc);
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_mkfs_part() - failed %s",
+                    str_error(rc));
                 fibril_mutex_unlock(&vol_parts_lock);
                 return rc;
@@ -369 +370 @@
 }
 
-int vol_part_get_info(vol_part_t *part, vol_part_info_t *pinfo)
+errno_t vol_part_get_info(vol_part_t *part, vol_part_info_t *pinfo)
 {
         pinfo->pcnt = part->pcnt;