Changeset b7fd2a0 in mainline for uspace/lib/c/generic/io/chardev.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/lib/c/generic/io/chardev.c (modified) (10 diffs)

uspace/lib/c/generic/io/chardev.c

@@ -50 +50 @@
  * @return EOK on success, ENOMEM if out of memory, EIO on I/O error
  */
-int chardev_open(async_sess_t *sess, chardev_t **rchardev)
+errno_t chardev_open(async_sess_t *sess, chardev_t **rchardev)
 {
         chardev_t *chardev;
@@ -94 +94 @@
  * @return EOK on success or non-zero error code
  */
-int chardev_read(chardev_t *chardev, void *buf, size_t size, size_t *nread)
+errno_t chardev_read(chardev_t *chardev, void *buf, size_t size, size_t *nread)
 {
         async_exch_t *exch = async_exchange_begin(chardev->sess);
@@ -105 +105 @@
         ipc_call_t answer;
         aid_t req = async_send_0(exch, CHARDEV_READ, &answer);
-        int rc = async_data_read_start(exch, buf, size);
+        errno_t rc = async_data_read_start(exch, buf, size);
         async_exchange_end(exch);
 
@@ -114 +114 @@
         }
 
-        int retval;
+        errno_t retval;
         async_wait_for(req, &retval);
 
@@ -124 +124 @@
         *nread = IPC_GET_ARG2(answer);
         /* In case of partial success, ARG1 contains the error code */
-        return (int) IPC_GET_ARG1(answer);
+        return (errno_t) IPC_GET_ARG1(answer);
 
 }
@@ -144 +144 @@
  * @return EOK on success or non-zero error code
  */
-static int chardev_write_once(chardev_t *chardev, const void *data,
+static errno_t chardev_write_once(chardev_t *chardev, const void *data,
     size_t size, size_t *nwritten)
 {
@@ -150 +150 @@
         ipc_call_t answer;
         aid_t req;
-        int rc;
+        errno_t rc;
 
         /* Break down large transfers */
@@ -166 +166 @@
         }
 
-        int retval;
+        errno_t retval;
         async_wait_for(req, &retval);
         if (retval != EOK) {
@@ -175 +175 @@
         *nwritten = IPC_GET_ARG2(answer);
         /* In case of partial success, ARG1 contains the error code */
-        return (int) IPC_GET_ARG1(answer);
+        return (errno_t) IPC_GET_ARG1(answer);
 }
 
@@ -193 +193 @@
  * @return EOK on success or non-zero error code
  */
-int chardev_write(chardev_t *chardev, const void *data, size_t size,
+errno_t chardev_write(chardev_t *chardev, const void *data, size_t size,
     size_t *nwritten)
 {
         size_t nw;
         size_t p;
-        int rc;
+        errno_t rc;
 
         p = 0;