Changeset b7fd2a0 in mainline for uspace/srv/fs/locfs/locfs_ops.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/locfs/locfs_ops.c (modified) (16 diffs)

uspace/srv/fs/locfs/locfs_ops.c

@@ -101 +101 @@
 };
 
-static int locfs_node_get_internal(fs_node_t **rfn, loc_object_type_t type,
+static errno_t locfs_node_get_internal(fs_node_t **rfn, loc_object_type_t type,
     service_id_t service_id)
 {
@@ -125 +125 @@
 }
 
-static int locfs_root_get(fs_node_t **rfn, service_id_t service_id)
+static errno_t locfs_root_get(fs_node_t **rfn, service_id_t service_id)
 {
         return locfs_node_get_internal(rfn, LOC_OBJECT_NONE, 0);
 }
 
-static int locfs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component)
+static errno_t locfs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component)
 {
         locfs_node_t *node = (locfs_node_t *) pfn->data;
-        int ret;
+        errno_t ret;
         
         if (node->service_id == 0) {
@@ -208 +208 @@
 }
 
-static int locfs_node_get(fs_node_t **rfn, service_id_t service_id, fs_index_t index)
+static errno_t locfs_node_get(fs_node_t **rfn, service_id_t service_id, fs_index_t index)
 {
         return locfs_node_get_internal(rfn, loc_id_probe(index), index);
 }
 
-static int locfs_node_open(fs_node_t *fn)
+static errno_t locfs_node_open(fs_node_t *fn)
 {
         locfs_node_t *node = (locfs_node_t *) fn->data;
@@ -312 +312 @@
 }
 
-static int locfs_node_put(fs_node_t *fn)
+static errno_t locfs_node_put(fs_node_t *fn)
 {
         free(fn->data);
@@ -319 +319 @@
 }
 
-static int locfs_create_node(fs_node_t **rfn, service_id_t service_id, int lflag)
+static errno_t locfs_create_node(fs_node_t **rfn, service_id_t service_id, int lflag)
 {
         assert((lflag & L_FILE) ^ (lflag & L_DIRECTORY));
@@ -327 +327 @@
 }
 
-static int locfs_destroy_node(fs_node_t *fn)
+static errno_t locfs_destroy_node(fs_node_t *fn)
 {
         return ENOTSUP;
 }
 
-static int locfs_link_node(fs_node_t *pfn, fs_node_t *cfn, const char *nm)
+static errno_t locfs_link_node(fs_node_t *pfn, fs_node_t *cfn, const char *nm)
 {
         return ENOTSUP;
 }
 
-static int locfs_unlink_node(fs_node_t *pfn, fs_node_t *cfn, const char *nm)
+static errno_t locfs_unlink_node(fs_node_t *pfn, fs_node_t *cfn, const char *nm)
 {
         return ENOTSUP;
 }
 
-static int locfs_has_children(bool *has_children, fs_node_t *fn)
+static errno_t locfs_has_children(bool *has_children, fs_node_t *fn)
 {
         locfs_node_t *node = (locfs_node_t *) fn->data;
@@ -455 +455 @@
 }
 
-static int locfs_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info)
+static errno_t locfs_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info)
 {
         return ENOTSUP;
 }
 
-static int locfs_mounted(service_id_t service_id, const char *opts,
+static errno_t locfs_mounted(service_id_t service_id, const char *opts,
     fs_index_t *index, aoff64_t *size)
 {
@@ -468 +468 @@
 }
 
-static int locfs_unmounted(service_id_t service_id)
+static errno_t locfs_unmounted(service_id_t service_id)
 {
         return ENOTSUP;
 }
 
-static int
+static errno_t
 locfs_read(service_id_t service_id, fs_index_t index, aoff64_t pos,
     size_t *rbytes)
@@ -590 +590 @@
                 
                 /* Wait for reply from the driver. */
-                int rc;
+                errno_t rc;
                 async_wait_for(msg, &rc);
 
                 /* Do not propagate EHANGUP back to VFS. */
-                if ((int) rc == EHANGUP)
+                if ((errno_t) rc == EHANGUP)
                         rc = ENOTSUP;
                 
@@ -604 +604 @@
 }
 
-static int
+static errno_t
 locfs_write(service_id_t service_id, fs_index_t index, aoff64_t pos,
     size_t *wbytes, aoff64_t *nsize)
@@ -654 +654 @@
                 
                 /* Wait for reply from the driver. */
-                int rc;
+                errno_t rc;
                 async_wait_for(msg, &rc);
 
                 /* Do not propagate EHANGUP back to VFS. */
-                if ((int) rc == EHANGUP)
+                if ((errno_t) rc == EHANGUP)
                         rc = ENOTSUP;
                 
@@ -669 +669 @@
 }
 
-static int
+static errno_t
 locfs_truncate(service_id_t service_id, fs_index_t index, aoff64_t size)
 {
@@ -675 +675 @@
 }
 
-static int locfs_close(service_id_t service_id, fs_index_t index)
+static errno_t locfs_close(service_id_t service_id, fs_index_t index)
 {
         if (index == 0)
@@ -715 +715 @@
 }
 
-static int locfs_sync(service_id_t service_id, fs_index_t index)
+static errno_t locfs_sync(service_id_t service_id, fs_index_t index)
 {
         if (index == 0)
@@ -752 +752 @@
                 
                 /* Wait for reply from the driver */
-                int rc;
+                errno_t rc;
                 async_wait_for(msg, &rc);
                 
@@ -761 +761 @@
 }
 
-static int locfs_destroy(service_id_t service_id, fs_index_t index)
+static errno_t locfs_destroy(service_id_t service_id, fs_index_t index)
 {
         return ENOTSUP;