Changeset b7fd2a0 in mainline for uspace/srv/fs/udf/udf_file.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_file.c (modified) (12 diffs)

uspace/srv/fs/udf/udf_file.c

@@ -57 +57 @@
  *
  */
-static int udf_read_extended_allocator(udf_node_t *node, uint16_t icb_flag,
+static errno_t udf_read_extended_allocator(udf_node_t *node, uint16_t icb_flag,
     uint32_t pos)
 {
         block_t *block = NULL;
-        int rc = block_get(&block, node->instance->service_id, pos,
+        errno_t rc = block_get(&block, node->instance->service_id, pos,
             BLOCK_FLAGS_NONE);
         if (rc != EOK)
@@ -93 +93 @@
  *
  */
-int udf_read_allocation_sequence(udf_node_t *node, uint8_t *af,
+errno_t udf_read_allocation_sequence(udf_node_t *node, uint8_t *af,
     uint16_t icb_flag, uint32_t start_alloc, uint32_t len)
 {
@@ -233 +233 @@
  * @return    EOK on success or an error code.
  */
-int udf_read_icb(udf_node_t *node)
+errno_t udf_read_icb(udf_node_t *node)
 {
         while (true) {
@@ -239 +239 @@
                 
                 block_t *block = NULL;
-                int rc = block_get(&block, node->instance->service_id, pos,
+                errno_t rc = block_get(&block, node->instance->service_id, pos,
                     BLOCK_FLAGS_NONE);
                 if (rc != EOK)
@@ -303 +303 @@
  *
  */
-int udf_node_get_core(udf_node_t *node)
+errno_t udf_node_get_core(udf_node_t *node)
 {
         node->link_cnt = 1;
@@ -318 +318 @@
  *
  */
-static int udf_get_fid_in_data(udf_file_identifier_descriptor_t **fid,
+static errno_t udf_get_fid_in_data(udf_file_identifier_descriptor_t **fid,
     udf_node_t *node, aoff64_t pos)
 {
@@ -369 +369 @@
  *
  */
-int udf_get_fid(udf_file_identifier_descriptor_t **fid, block_t **block,
+errno_t udf_get_fid(udf_file_identifier_descriptor_t **fid, block_t **block,
     udf_node_t *node, aoff64_t pos)
 {
@@ -388 +388 @@
  *
  */
-int udf_get_fid_in_allocator(udf_file_identifier_descriptor_t **fid,
+errno_t udf_get_fid_in_allocator(udf_file_identifier_descriptor_t **fid,
     block_t **block, udf_node_t *node, aoff64_t pos)
 {
@@ -402 +402 @@
                 size_t i = 0;
                 while (i * node->instance->sector_size < node->allocators[j].length) {
-                        int rc = block_get(block, node->instance->service_id,
+                        errno_t rc = block_get(block, node->instance->service_id,
                             node->allocators[j].position + i, BLOCK_FLAGS_NONE);
                         if (rc != EOK) {
@@ -469 +469 @@
  *
  */
-int udf_get_fid_in_sector(udf_file_identifier_descriptor_t **fid,
+errno_t udf_get_fid_in_sector(udf_file_identifier_descriptor_t **fid,
     block_t **block, udf_node_t *node, aoff64_t pos, size_t *n, void **buf,
     size_t *len)
@@ -576 +576 @@
  *
  */
-int udf_read_file(size_t *read_len, ipc_callid_t callid, udf_node_t *node,
+errno_t udf_read_file(size_t *read_len, ipc_callid_t callid, udf_node_t *node,
     aoff64_t pos, size_t len)
 {
@@ -594 +594 @@
         
         block_t *block = NULL;
-        int rc = block_get(&block, node->instance->service_id,
+        errno_t rc = block_get(&block, node->instance->service_id,
             node->allocators[i].position + (sector_num - sector_cnt),
             BLOCK_FLAGS_NONE);