Changeset b7fd2a0 in mainline for uspace/srv/hid/isdv4_tablet

Timestamp:

2018-01-13T03:10:29Z (8 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.

Location:

uspace/srv/hid/isdv4_tablet

Files:

• isdv4.c (modified) (6 diffs)
• isdv4.h (modified) (1 diff)
• main.c (modified) (2 diffs)

uspace/srv/hid/isdv4_tablet/isdv4.c

@@ -294 +294 @@
 }
 
-static int read_packets(isdv4_state_t *state, packet_consumer_fn consumer)
+static errno_t read_packets(isdv4_state_t *state, packet_consumer_fn consumer)
 {
         bool reading = true;
         while (reading) {
                 size_t nread;
-                int rc;
+                errno_t rc;
 
                 rc = chardev_read(state->chardev, state->buf + state->buf_end,
@@ -363 +363 @@
 static bool write_command(chardev_t *chardev, uint8_t command)
 {
-        int rc;
+        errno_t rc;
         size_t nwr;
 
@@ -370 +370 @@
 }
 
-int isdv4_init(isdv4_state_t *state, async_sess_t *sess,
+errno_t isdv4_init(isdv4_state_t *state, async_sess_t *sess,
     isdv4_event_fn event_fn)
 {
         chardev_t *chardev;
-        int rc;
+        errno_t rc;
 
         rc = chardev_open(sess, &chardev);
@@ -396 +396 @@
 }
 
-int isdv4_init_tablet(isdv4_state_t *state)
+errno_t isdv4_init_tablet(isdv4_state_t *state)
 {
         if (!write_command(state->chardev, CMD_STOP))
@@ -407 +407 @@
                 return EIO;
 
-        int rc = read_packets(state, parse_response_stylus);
+        errno_t rc = read_packets(state, parse_response_stylus);
         if (rc != EOK)
                 return rc;
@@ -424 +424 @@
 }
 
-int isdv4_read_events(isdv4_state_t *state)
+errno_t isdv4_read_events(isdv4_state_t *state)
 {
         return read_packets(state, parse_event);

uspace/srv/hid/isdv4_tablet/isdv4.h

@@ -90 +90 @@
 };
 
-extern int isdv4_init(isdv4_state_t *, async_sess_t *, isdv4_event_fn);
-extern int isdv4_init_tablet(isdv4_state_t *);
-extern int isdv4_read_events(isdv4_state_t *state);
+extern errno_t isdv4_init(isdv4_state_t *, async_sess_t *, isdv4_event_fn);
+extern errno_t isdv4_init_tablet(isdv4_state_t *);
+extern errno_t isdv4_read_events(isdv4_state_t *state);
 extern void isdv4_fini(isdv4_state_t *);
 

uspace/srv/hid/isdv4_tablet/main.c

@@ -50 +50 @@
 }
 
-static int read_fibril(void *unused)
-{
-        int rc = isdv4_read_events(&state);
+static errno_t read_fibril(void *unused)
+{
+        errno_t rc = isdv4_read_events(&state);
         if (rc != EOK) {
                 fprintf(stderr, "Failed reading events");
@@ -182 +182 @@
 
         int arg = 1;
-        int rc;
+        errno_t rc;
 
         isdv4_event_fn event_fn = emit_event;