Changes in uspace/srv/fs/udf/udf_volume.c [38d150e:b7fd2a0] in mainline

File:

• uspace/srv/fs/udf/udf_volume.c (modified) (10 diffs)

uspace/srv/fs/udf/udf_volume.c

@@ -81 +81 @@
  * @param vd         Returned value - Volume Descriptor.
  *
- * @return EOK on success or a negative error code.
- *
- */
-static int udf_volume_recongnition_structure_test(service_id_t service_id,
+ * @return EOK on success or an error code.
+ *
+ */
+static errno_t udf_volume_recongnition_structure_test(service_id_t service_id,
     aoff64_t addr, udf_vrs_descriptor_t *vd)
 {
@@ -98 +98 @@
  * @param service_id
  *
- * @return    EOK on success or a negative error code.
- */
-int udf_volume_recongnition(service_id_t service_id) 
+ * @return    EOK on success or an error code.
+ */
+errno_t udf_volume_recongnition(service_id_t service_id) 
 {
         aoff64_t addr = VRS_ADDR;
@@ -109 +109 @@
                 return ENOMEM;
         
-        int rc = udf_volume_recongnition_structure_test(service_id, addr, vd);
+        errno_t rc = udf_volume_recongnition_structure_test(service_id, addr, vd);
         if (rc != EOK) {
                 free(vd);
@@ -167 +167 @@
  * @param sector_size Expected sector size
  *
- * @return EOK on success or a negative error code.
- *
- */
-static int udf_get_anchor_volume_descriptor_by_ssize(service_id_t service_id,
+ * @return EOK on success or an error code.
+ *
+ */
+static errno_t udf_get_anchor_volume_descriptor_by_ssize(service_id_t service_id,
     udf_anchor_volume_descriptor_t *avd, uint32_t sector_size)
 {
-        int rc = block_read_bytes_direct(service_id,
+        errno_t rc = block_read_bytes_direct(service_id,
             UDF_AVDP_SECTOR * sector_size,
             sizeof(udf_anchor_volume_descriptor_t), avd);
@@ -204 +204 @@
  * @param avd        Returned value - Anchor Volume Descriptor
  *
- * @return EOK on success or a negative error code.
- *
- */
-int udf_get_anchor_volume_descriptor(service_id_t service_id,
+ * @return EOK on success or an error code.
+ *
+ */
+errno_t udf_get_anchor_volume_descriptor(service_id_t service_id,
     udf_anchor_volume_descriptor_t *avd)
 {
@@ -213 +213 @@
         
         udf_instance_t *instance;
-        int rc = fs_instance_get(service_id, (void **) &instance);
+        errno_t rc = fs_instance_get(service_id, (void **) &instance);
         if (rc != EOK)
                 return rc;
@@ -357 +357 @@
  * @param id       Index of partition in instance::partitions array
  *
- * @return EOK on success or a negative error code.
- *
- */
-static int udf_read_virtual_partition(udf_instance_t *instance, uint32_t pos,
+ * @return EOK on success or an error code.
+ *
+ */
+static errno_t udf_read_virtual_partition(udf_instance_t *instance, uint32_t pos,
     uint32_t id)
 {
         block_t *block = NULL;
-        int rc = block_get(&block, instance->service_id, pos,
+        errno_t rc = block_get(&block, instance->service_id, pos,
             BLOCK_FLAGS_NONE);
         if (rc != EOK)
@@ -438 +438 @@
  * @param instance UDF instance
  *
- * @return EOK on success or a negative error code.
- *
- */
-static int udf_fill_volume_info(udf_logical_volume_descriptor_t *lvd,
+ * @return EOK on success or an error code.
+ *
+ */
+static errno_t udf_fill_volume_info(udf_logical_volume_descriptor_t *lvd,
     size_t lvd_cnt, udf_partition_descriptor_t *pd, size_t pd_cnt,
     udf_instance_t *instance)
@@ -553 +553 @@
                                 instance->partitions[j].number =
                                     FLE16(metadata->partition_number);
-                                int rc = udf_read_virtual_partition(instance,
+                                errno_t rc = udf_read_virtual_partition(instance,
                                     FLE32(metadata->metadata_fileloc) +
                                     FLE32(pd[pd_num].starting_location), j);
@@ -598 +598 @@
  * @param addr       UDF extent descriptor (ECMA 167 3/7.1)
  *
- * @return EOK on success or a negative error code.
- *
- */
-int udf_read_volume_descriptor_sequence(service_id_t service_id,
+ * @return EOK on success or an error code.
+ *
+ */
+errno_t udf_read_volume_descriptor_sequence(service_id_t service_id,
     udf_extent_t addr)
 {
         udf_instance_t *instance;
-        int rc = fs_instance_get(service_id, (void **) &instance);
+        errno_t rc = fs_instance_get(service_id, (void **) &instance);
         if (rc != EOK)
                 return rc;