Changes in uspace/lib/c/generic/vol.c [b7fd2a0:9c2c7d2] in mainline

File:

• uspace/lib/c/generic/vol.c (modified) (12 diffs)

uspace/lib/c/generic/vol.c

@@ -48 +48 @@
  *             cannot be contacted.
  */
-errno_t vol_create(vol_t **rvol)
+int vol_create(vol_t **rvol)
 {
         vol_t *vol;
         service_id_t vol_svcid;
-        errno_t rc;
+        int rc;
 
         vol = calloc(1, sizeof(vol_t));
@@ -101 +101 @@
  * @param act_size Place to store actual size of complete data.
  *
- * @return EOK on success or an error code.
- */
-static errno_t vol_get_ids_once(vol_t *vol, sysarg_t method, sysarg_t arg1,
+ * @return EOK on success or negative error code.
+ */
+static int vol_get_ids_once(vol_t *vol, sysarg_t method, sysarg_t arg1,
     sysarg_t *id_buf, size_t buf_size, size_t *act_size)
 {
@@ -110 +110 @@
         ipc_call_t answer;
         aid_t req = async_send_1(exch, method, arg1, &answer);
-        errno_t rc = async_data_read_start(exch, id_buf, buf_size);
+        int rc = async_data_read_start(exch, id_buf, buf_size);
 
         async_exchange_end(exch);
@@ -119 +119 @@
         }
 
-        errno_t retval;
+        sysarg_t retval;
         async_wait_for(req, &retval);
 
@@ -139 +139 @@
  * @param data   Place to store pointer to array of IDs
  * @param count  Place to store number of IDs
- * @return       EOK on success or an error code
- */
-static errno_t vol_get_ids_internal(vol_t *vol, sysarg_t method, sysarg_t arg1,
+ * @return       EOK on success or negative error code
+ */
+static int vol_get_ids_internal(vol_t *vol, sysarg_t method, sysarg_t arg1,
     sysarg_t **data, size_t *count)
 {
@@ -148 +148 @@
 
         size_t act_size = 0;
-        errno_t rc = vol_get_ids_once(vol, method, arg1, NULL, 0, &act_size);
+        int rc = vol_get_ids_once(vol, method, arg1, NULL, 0, &act_size);
         if (rc != EOK)
                 return rc;
@@ -183 +183 @@
  * @param count Place to store length of array (number of entries)
  *
- * @return EOK on success or an error code
- */
-errno_t vol_get_parts(vol_t *vol, service_id_t **data, size_t *count)
+ * @return EOK on success or negative error code
+ */
+int vol_get_parts(vol_t *vol, service_id_t **data, size_t *count)
 {
         return vol_get_ids_internal(vol, VOL_GET_PARTS, 0, data, count);
@@ -196 +196 @@
  * until it is discovered.
  */
-errno_t vol_part_add(vol_t *vol, service_id_t sid)
-{
-        async_exch_t *exch;
-        errno_t retval;
+int vol_part_add(vol_t *vol, service_id_t sid)
+{
+        async_exch_t *exch;
+        int retval;
 
         exch = async_exchange_begin(vol->sess);
@@ -212 +212 @@
 
 /** Get partition information. */
-errno_t vol_part_info(vol_t *vol, service_id_t sid, vol_part_info_t *vinfo)
-{
-        async_exch_t *exch;
-        errno_t retval;
+int vol_part_info(vol_t *vol, service_id_t sid, vol_part_info_t *vinfo)
+{
+        async_exch_t *exch;
+        sysarg_t retval;
         ipc_call_t answer;
 
         exch = async_exchange_begin(vol->sess);
         aid_t req = async_send_1(exch, VOL_PART_INFO, sid, &answer);
-        errno_t rc = async_data_read_start(exch, vinfo, sizeof(vol_part_info_t));
+        int rc = async_data_read_start(exch, vinfo, sizeof(vol_part_info_t));
         async_exchange_end(exch);
 
@@ -237 +237 @@
 /** Erase partition (to the extent where we will consider it not containing
  * a file system. */
-errno_t vol_part_empty(vol_t *vol, service_id_t sid)
-{
-        async_exch_t *exch;
-        errno_t retval;
+int vol_part_empty(vol_t *vol, service_id_t sid)
+{
+        async_exch_t *exch;
+        int retval;
 
         exch = async_exchange_begin(vol->sess);
@@ -253 +253 @@
 
 /** Get volume label support. */
-errno_t vol_part_get_lsupp(vol_t *vol, vol_fstype_t fstype,
+int vol_part_get_lsupp(vol_t *vol, vol_fstype_t fstype,
     vol_label_supp_t *vlsupp)
 {
         async_exch_t *exch;
-        errno_t retval;
+        sysarg_t retval;
         ipc_call_t answer;
 
         exch = async_exchange_begin(vol->sess);
         aid_t req = async_send_1(exch, VOL_PART_LSUPP, fstype, &answer);
-        errno_t rc = async_data_read_start(exch, vlsupp, sizeof(vol_label_supp_t));
+        int rc = async_data_read_start(exch, vlsupp, sizeof(vol_label_supp_t));
         async_exchange_end(exch);
 
@@ -278 +278 @@
 
 /** Create file system. */
-errno_t vol_part_mkfs(vol_t *vol, service_id_t sid, vol_fstype_t fstype,
+int vol_part_mkfs(vol_t *vol, service_id_t sid, vol_fstype_t fstype,
     const char *label)
 {
         async_exch_t *exch;
         ipc_call_t answer;
-        errno_t retval;
+        sysarg_t retval;
 
         exch = async_exchange_begin(vol->sess);