Changeset b7fd2a0 in mainline for uspace/lib/usbvirt/src/ipc_hc.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/usbvirt/src/ipc_hc.c (modified) (13 diffs)

uspace/lib/usbvirt/src/ipc_hc.c

@@ -55 +55 @@
  *
  */
-int usbvirt_ipc_send_control_read(async_sess_t *sess, void *setup_buffer,
+errno_t usbvirt_ipc_send_control_read(async_sess_t *sess, void *setup_buffer,
     size_t setup_buffer_size, void *data_buffer, size_t data_buffer_size,
     size_t *data_transfered_size)
@@ -77 +77 @@
         }
         
-        int rc = async_data_write_start(exch, setup_buffer, setup_buffer_size);
+        errno_t rc = async_data_write_start(exch, setup_buffer, setup_buffer_size);
         if (rc != EOK) {
                 async_exchange_end(exch);
@@ -95 +95 @@
         }
         
-        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);
@@ -103 +103 @@
                 /* Prefer the 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;
         
         if (data_transfered_size != NULL)
@@ -129 +129 @@
  *
  */
-int usbvirt_ipc_send_control_write(async_sess_t *sess, void *setup_buffer,
+errno_t usbvirt_ipc_send_control_write(async_sess_t *sess, void *setup_buffer,
     size_t setup_buffer_size, void *data_buffer, size_t data_buffer_size)
 {
@@ -150 +150 @@
         }
         
-        int rc = async_data_write_start(exch, setup_buffer, setup_buffer_size);
+        errno_t rc = async_data_write_start(exch, setup_buffer, setup_buffer_size);
         if (rc != EOK) {
                 async_exchange_end(exch);
@@ -168 +168 @@
         async_exchange_end(exch);
         
-        int opening_request_rc;
+        errno_t opening_request_rc;
         async_wait_for(opening_request, &opening_request_rc);
         
-        return (int) opening_request_rc;
+        return (errno_t) opening_request_rc;
 }
 
@@ -186 +186 @@
  *
  */
-int usbvirt_ipc_send_data_in(async_sess_t *sess, usb_endpoint_t ep,
+errno_t usbvirt_ipc_send_data_in(async_sess_t *sess, usb_endpoint_t ep,
     usb_transfer_type_t tr_type, void *data, size_t data_size, size_t *act_size)
 {
@@ -230 +230 @@
         }
         
-        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);
@@ -238 +238 @@
                 /* Prefer the 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;
         
         if (act_size != NULL)
@@ -263 +263 @@
  *
  */
-int usbvirt_ipc_send_data_out(async_sess_t *sess, usb_endpoint_t ep,
+errno_t usbvirt_ipc_send_data_out(async_sess_t *sess, usb_endpoint_t ep,
     usb_transfer_type_t tr_type, void *data, size_t data_size)
 {
@@ -296 +296 @@
         }
         
-        int rc = async_data_write_start(exch, data, data_size);
+        errno_t rc = async_data_write_start(exch, data, data_size);
         
         async_exchange_end(exch);
@@ -305 +305 @@
         }
         
-        int opening_request_rc;
+        errno_t opening_request_rc;
         async_wait_for(opening_request, &opening_request_rc);
         
-        return (int) opening_request_rc;
+        return (errno_t) opening_request_rc;
 }