Changeset b7fd2a0 in mainline for uspace/srv/fs/udf/udf_volume.c

Timestamp:

2018-01-13T03:10:29Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a53ed3a

Parents:

36f0738

Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
<sup>git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`</sup>

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

File:

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

uspace/srv/fs/udf/udf_volume.c

@@ -84 +84 @@
  *
  */
-static int udf_volume_recongnition_structure_test(service_id_t service_id,
+static errno_t udf_volume_recongnition_structure_test(service_id_t service_id,
     aoff64_t addr, udf_vrs_descriptor_t *vd)
 {
@@ -100 +100 @@
  * @return    EOK on success or an error code.
  */
-int udf_volume_recongnition(service_id_t service_id) 
+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);
@@ -170 +170 @@
  *
  */
-static int udf_get_anchor_volume_descriptor_by_ssize(service_id_t service_id,
+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);
@@ -207 +207 @@
  *
  */
-int udf_get_anchor_volume_descriptor(service_id_t service_id,
+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;
@@ -360 +360 @@
  *
  */
-static int udf_read_virtual_partition(udf_instance_t *instance, uint32_t pos,
+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)
@@ -441 +441 @@
  *
  */
-static int udf_fill_volume_info(udf_logical_volume_descriptor_t *lvd,
+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);
@@ -601 +601 @@
  *
  */
-int udf_read_volume_descriptor_sequence(service_id_t service_id,
+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;