Changeset b7fd2a0 in mainline for uspace/lib/drv/generic/remote_audio_mixer.c

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.

File:

• uspace/lib/drv/generic/remote_audio_mixer.c (modified) (12 diffs)

uspace/lib/drv/generic/remote_audio_mixer.c

@@ -94 +94 @@
  * @return Error code.
  */
-int audio_mixer_get_info(async_exch_t *exch, const char **name, unsigned *items)
+errno_t audio_mixer_get_info(async_exch_t *exch, const char **name, unsigned *items)
 {
         if (!exch)
                 return EINVAL;
         sysarg_t name_size, itemc;
-        const int ret = async_req_1_2(exch, DEV_IFACE_ID(AUDIO_MIXER_IFACE),
+        const errno_t ret = async_req_1_2(exch, DEV_IFACE_ID(AUDIO_MIXER_IFACE),
             IPC_M_AUDIO_MIXER_GET_INFO, &name_size, &itemc);
         if (ret == EOK && name) {
@@ -109 +109 @@
                         return ENOMEM;
                 }
-                const int ret =
+                const errno_t ret =
                     async_data_read_start(exch, name_place, name_size);
                 if (ret != EOK) {
@@ -130 +130 @@
  * @return Error code.
  */
-int audio_mixer_get_item_info(async_exch_t *exch, unsigned item,
+errno_t audio_mixer_get_item_info(async_exch_t *exch, unsigned item,
     const char **name, unsigned *levels)
 {
@@ -136 +136 @@
                 return EINVAL;
         sysarg_t name_size, lvls;
-        const int ret = async_req_2_2(exch, DEV_IFACE_ID(AUDIO_MIXER_IFACE),
+        const errno_t ret = async_req_2_2(exch, DEV_IFACE_ID(AUDIO_MIXER_IFACE),
             IPC_M_AUDIO_MIXER_GET_ITEM_INFO, item, &name_size, &lvls);
         if (ret == EOK && name) {
@@ -146 +146 @@
                         return ENOMEM;
                 }
-                const int ret =
+                const errno_t ret =
                     async_data_read_start(exch, name_place, name_size);
                 if (ret != EOK) {
@@ -166 +166 @@
  * @return Error code.
  */
-int audio_mixer_set_item_level(async_exch_t *exch, unsigned item,
+errno_t audio_mixer_set_item_level(async_exch_t *exch, unsigned item,
     unsigned level)
 {
@@ -183 +183 @@
  * @return Error code.
  */
-int audio_mixer_get_item_level(async_exch_t *exch, unsigned item,
+errno_t audio_mixer_get_item_level(async_exch_t *exch, unsigned item,
     unsigned *level)
 {
@@ -189 +189 @@
                 return EINVAL;
         sysarg_t current;
-        const int ret = async_req_2_1(exch, DEV_IFACE_ID(AUDIO_MIXER_IFACE),
+        const errno_t ret = async_req_2_1(exch, DEV_IFACE_ID(AUDIO_MIXER_IFACE),
             IPC_M_AUDIO_MIXER_GET_ITEM_LEVEL, item, &current);
         if (ret == EOK && level)
@@ -229 +229 @@
         const char *name = NULL;
         unsigned items = 0;
-        const int ret = mixer_iface->get_info(fun, &name, &items);
+        const errno_t ret = mixer_iface->get_info(fun, &name, &items);
         const size_t name_size = name ? str_size(name) + 1 : 0;
         async_answer_2(callid, ret, name_size, items);
@@ -261 +261 @@
         const char *name = NULL;
         unsigned values = 0;
-        const int ret = mixer_iface->get_item_info(fun, item, &name, &values);
+        const errno_t ret = mixer_iface->get_item_info(fun, item, &name, &values);
         const size_t name_size = name ? str_size(name) + 1 : 0;
         async_answer_2(callid, ret, name_size, values);
@@ -291 +291 @@
         const unsigned item = DEV_IPC_GET_ARG1(*call);
         const unsigned value = DEV_IPC_GET_ARG2(*call);
-        const int ret = mixer_iface->set_item_level(fun, item, value);
+        const errno_t ret = mixer_iface->set_item_level(fun, item, value);
         async_answer_0(callid, ret);
 }
@@ -306 +306 @@
         const unsigned item = DEV_IPC_GET_ARG1(*call);
         unsigned current = 0;
-        const int ret =
+        const errno_t ret =
             mixer_iface->get_item_level(fun, item, &current);
         async_answer_1(callid, ret, current);