Changeset b7fd2a0 in mainline for uspace/lib/drv/generic/remote_usbhid.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/drv/generic/remote_usbhid.c (modified) (12 diffs)

uspace/lib/drv/generic/remote_usbhid.c

@@ -97 +97 @@
  *
  */
-int usbhid_dev_get_event_length(async_sess_t *dev_sess, size_t *size)
+errno_t usbhid_dev_get_event_length(async_sess_t *dev_sess, size_t *size)
 {
         if (!dev_sess)
@@ -105 +105 @@
         
         sysarg_t len;
-        int rc = async_req_1_1(exch, DEV_IFACE_ID(USBHID_DEV_IFACE),
+        errno_t rc = async_req_1_1(exch, DEV_IFACE_ID(USBHID_DEV_IFACE),
             IPC_M_USBHID_GET_EVENT_LENGTH, &len);
         
@@ -132 +132 @@
  *
  */
-int usbhid_dev_get_event(async_sess_t *dev_sess, uint8_t *buf,
+errno_t usbhid_dev_get_event(async_sess_t *dev_sess, uint8_t *buf,
     size_t size, size_t *actual_size, int *event_nr, unsigned int flags)
 {
@@ -174 +174 @@
         }
         
-        int data_request_rc;
-        int opening_request_rc;
+        errno_t data_request_rc;
+        errno_t opening_request_rc;
         async_wait_for(data_request, &data_request_rc);
         async_wait_for(opening_request, &opening_request_rc);
@@ -182 +182 @@
                 /* Prefer return code of the opening request. */
                 if (opening_request_rc != EOK)
-                        return (int) opening_request_rc;
+                        return (errno_t) opening_request_rc;
                 else
-                        return (int) data_request_rc;
+                        return (errno_t) data_request_rc;
         }
         
         if (opening_request_rc != EOK)
-                return (int) opening_request_rc;
+                return (errno_t) opening_request_rc;
         
         size_t act_size = IPC_GET_ARG2(data_request_call);
@@ -204 +204 @@
 }
 
-int usbhid_dev_get_report_descriptor_length(async_sess_t *dev_sess,
+errno_t usbhid_dev_get_report_descriptor_length(async_sess_t *dev_sess,
     size_t *size)
 {
@@ -213 +213 @@
         
         sysarg_t arg_size;
-        int rc = async_req_1_1(exch, DEV_IFACE_ID(USBHID_DEV_IFACE),
+        errno_t rc = async_req_1_1(exch, DEV_IFACE_ID(USBHID_DEV_IFACE),
             IPC_M_USBHID_GET_REPORT_DESCRIPTOR_LENGTH, &arg_size);
         
@@ -226 +226 @@
 }
 
-int usbhid_dev_get_report_descriptor(async_sess_t *dev_sess, uint8_t *buf,
+errno_t usbhid_dev_get_report_descriptor(async_sess_t *dev_sess, uint8_t *buf,
     size_t size, size_t *actual_size)
 {
@@ -259 +259 @@
         }
         
-        int data_request_rc;
-        int opening_request_rc;
+        errno_t data_request_rc;
+        errno_t opening_request_rc;
         async_wait_for(data_request, &data_request_rc);
         async_wait_for(opening_request, &opening_request_rc);
@@ -267 +267 @@
                 /* Prefer return code of the opening request. */
                 if (opening_request_rc != EOK)
-                        return (int) opening_request_rc;
+                        return (errno_t) opening_request_rc;
                 else
-                        return (int) data_request_rc;
+                        return (errno_t) data_request_rc;
         }
         
         if (opening_request_rc != EOK)
-                return (int) opening_request_rc;
+                return (errno_t) opening_request_rc;
         
         size_t act_size = IPC_GET_ARG2(data_request_call);
@@ -362 +362 @@
         }
 
-        int rc;
+        errno_t rc;
 
         uint8_t *data = malloc(len);
@@ -438 +438 @@
 
         size_t act_len = 0;
-        int rc = hid_iface->get_report_descriptor(fun, descriptor, len,
+        errno_t rc = hid_iface->get_report_descriptor(fun, descriptor, len,
             &act_len);
         if (act_len > len) {