Changeset b7fd2a0 in mainline for uspace/srv/vfs/vfs_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/vfs/vfs_file.c (modified) (11 diffs)

uspace/srv/vfs/vfs_file.c

@@ -64 +64 @@
 } vfs_boxed_handle_t;
 
-static int _vfs_fd_free(vfs_client_data_t *, int);
+static errno_t _vfs_fd_free(vfs_client_data_t *, int);
 
 /** Initialize the table of open files. */
@@ -133 +133 @@
 
 /** Close the file in the endpoint FS server. */
-static int vfs_file_close_remote(vfs_file_t *file)
+static errno_t vfs_file_close_remote(vfs_file_t *file)
 {
         assert(!file->refcnt);
@@ -145 +145 @@
         vfs_exchange_release(exch);
         
-        int rc;
+        errno_t rc;
         async_wait_for(msg, &rc);
         
@@ -168 +168 @@
  *                      decremented.
  */
-static int vfs_file_delref(vfs_client_data_t *vfs_data, vfs_file_t *file)
-{
-        int rc = EOK;
+static errno_t vfs_file_delref(vfs_client_data_t *vfs_data, vfs_file_t *file)
+{
+        errno_t rc = EOK;
 
         assert(fibril_mutex_is_locked(&vfs_data->lock));
@@ -192 +192 @@
 }
 
-static int _vfs_fd_alloc(vfs_client_data_t *vfs_data, vfs_file_t **file, bool desc, int *out_fd)
+static errno_t _vfs_fd_alloc(vfs_client_data_t *vfs_data, vfs_file_t **file, bool desc, int *out_fd)
 {
         if (!vfs_files_init(vfs_data))
@@ -254 +254 @@
  * @return Error code.
  */
-int vfs_fd_alloc(vfs_file_t **file, bool desc, int *out_fd)
+errno_t vfs_fd_alloc(vfs_file_t **file, bool desc, int *out_fd)
 {
         return _vfs_fd_alloc(VFS_DATA, file, desc, out_fd);
 }
 
-static int _vfs_fd_free_locked(vfs_client_data_t *vfs_data, int fd)
+static errno_t _vfs_fd_free_locked(vfs_client_data_t *vfs_data, int fd)
 {
         if ((fd < 0) || (fd >= MAX_OPEN_FILES) || !vfs_data->files[fd]) {
@@ -265 +265 @@
         }
 
-        int rc = vfs_file_delref(vfs_data, vfs_data->files[fd]);
+        errno_t rc = vfs_file_delref(vfs_data, vfs_data->files[fd]);
         vfs_data->files[fd] = NULL;
         return rc;
 }
 
-static int _vfs_fd_free(vfs_client_data_t *vfs_data, int fd)
-{
-        int rc;
+static errno_t _vfs_fd_free(vfs_client_data_t *vfs_data, int fd)
+{
+        errno_t rc;
 
         if (!vfs_files_init(vfs_data))
@@ -291 +291 @@
  *                      descriptor.
  */
-int vfs_fd_free(int fd)
+errno_t vfs_fd_free(int fd)
 {
         return _vfs_fd_free(VFS_DATA, fd);
@@ -305 +305 @@
  *
  */
-int vfs_fd_assign(vfs_file_t *file, int fd)
+errno_t vfs_fd_assign(vfs_file_t *file, int fd)
 {
         if (!vfs_files_init(VFS_DATA))
@@ -429 +429 @@
 }
 
-int vfs_wait_handle_internal(bool high_fd, int *out_fd)
+errno_t vfs_wait_handle_internal(bool high_fd, int *out_fd)
 {
         vfs_client_data_t *vfs_data = VFS_DATA; 
@@ -443 +443 @@
 
         vfs_file_t *file;
-        int rc = _vfs_fd_alloc(vfs_data, &file, high_fd, out_fd);
+        errno_t rc = _vfs_fd_alloc(vfs_data, &file, high_fd, out_fd);
         if (rc != EOK) {
                 vfs_node_delref(bh->node);