Changeset b7fd2a0 in mainline for uspace/lib/fs/libfs.c

Timestamp:

2018-01-13T03:10:29Z (6 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/lib/fs/libfs.c (modified) (22 diffs)

uspace/lib/fs/libfs.c

@@ -84 +84 @@
 {
         service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
-        int rc;
+        errno_t rc;
         vfs_fs_probe_info_t info;
         
@@ -112 +112 @@
         service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
         char *opts;
-        int rc;
+        errno_t rc;
         
         /* Accept the mount options. */
@@ -136 +136 @@
 {
         service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
-        int rc; 
+        errno_t rc; 
 
         rc = vfs_out_ops->unmounted(service_id);
@@ -160 +160 @@
             IPC_GET_ARG4(*req));
         size_t rbytes;
-        int rc;
+        errno_t rc;
 
         rc = vfs_out_ops->read(service_id, index, pos, &rbytes);
@@ -178 +178 @@
         size_t wbytes;
         aoff64_t nsize;
-        int rc;
+        errno_t rc;
 
         rc = vfs_out_ops->write(service_id, index, pos, &wbytes, &nsize);
@@ -195 +195 @@
         aoff64_t size = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3(*req),
             IPC_GET_ARG4(*req));
-        int rc;
+        errno_t rc;
 
         rc = vfs_out_ops->truncate(service_id, index, size);
@@ -206 +206 @@
         service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
         fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);
-        int rc;
+        errno_t rc;
 
         rc = vfs_out_ops->close(service_id, index);
@@ -218 +218 @@
         fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);
 
-        int rc;
+        errno_t rc;
         fs_node_t *node = NULL;
         rc = libfs_ops->node_get(&node, service_id, index);
@@ -244 +244 @@
         service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
         fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);
-        int rc;
+        errno_t rc;
 
         rc = vfs_out_ops->sync(service_id, index);
@@ -260 +260 @@
         service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
         fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);
-        int rc;
+        errno_t rc;
 
         fs_node_t *node = NULL;
@@ -364 +364 @@
  *
  */
-int fs_register(async_sess_t *sess, vfs_info_t *info, vfs_out_ops_t *vops,
+errno_t fs_register(async_sess_t *sess, vfs_info_t *info, vfs_out_ops_t *vops,
     libfs_ops_t *lops)
 {
@@ -381 +381 @@
          * Send our VFS info structure to VFS.
          */
-        int rc = async_data_write_start(exch, info, sizeof(*info));
+        errno_t rc = async_data_write_start(exch, info, sizeof(*info));
         
         if (rc != EOK) {
@@ -446 +446 @@
 }
 
-static int plb_get_component(char *dest, unsigned *sz, unsigned *ppos,
+static errno_t plb_get_component(char *dest, unsigned *sz, unsigned *ppos,
     unsigned last)
 {
@@ -476 +476 @@
 }
 
-static int receive_fname(char *buffer)
+static errno_t receive_fname(char *buffer)
 {
         size_t size;
@@ -500 +500 @@
         
         char component[NAME_MAX + 1];
-        int rc = receive_fname(component);
+        errno_t rc = receive_fname(component);
         if (rc != EOK) {
                 async_answer_0(rid, rc);
@@ -555 +555 @@
         
         char component[NAME_MAX + 1];
-        int rc;
+        errno_t rc;
         
         fs_node_t *par = NULL;
@@ -727 +727 @@
 
         fs_node_t *fn;
-        int rc = ops->node_get(&fn, service_id, index);
+        errno_t rc = ops->node_get(&fn, service_id, index);
         on_error(rc, answer_and_return(rid, rc));
 
@@ -766 +766 @@
 
         fs_node_t *fn;
-        int rc = ops->node_get(&fn, service_id, index);
+        errno_t rc = ops->node_get(&fn, service_id, index);
         on_error(rc, answer_and_return(rid, rc));
 
@@ -826 +826 @@
         
         fs_node_t *fn;
-        int rc = ops->node_get(&fn, service_id, index);
+        errno_t rc = ops->node_get(&fn, service_id, index);
         on_error(rc, answer_and_return(rid, rc));
         
@@ -853 +853 @@
 } fs_instance_t;
 
-int fs_instance_create(service_id_t service_id, void *data)
+errno_t fs_instance_create(service_id_t service_id, void *data)
 {
         fs_instance_t *inst = malloc(sizeof(fs_instance_t));
@@ -884 +884 @@
 }
 
-int fs_instance_get(service_id_t service_id, void **idp)
+errno_t fs_instance_get(service_id_t service_id, void **idp)
 {
         fibril_mutex_lock(&instances_mutex);
@@ -898 +898 @@
 }
 
-int fs_instance_destroy(service_id_t service_id)
+errno_t fs_instance_destroy(service_id_t service_id)
 {
         fibril_mutex_lock(&instances_mutex);