Changeset 5a6cc679 in mainline for uspace/app/mixerctl/mixerctl.c

Timestamp:

2018-01-31T02:21:24Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• uspace/app/mixerctl/mixerctl.c (modified) (5 diffs)

uspace/app/mixerctl/mixerctl.c

@@ -51 +51 @@
         const char* name = NULL;
         unsigned count = 0;
-        int ret = audio_mixer_get_info(exch, &name, &count);
+        errno_t ret = audio_mixer_get_info(exch, &name, &count);
         if (ret != EOK) {
                 printf("Failed to get mixer info: %s.\n", str_error(ret));
@@ -61 +61 @@
                 const char *name = NULL;
                 unsigned levels = 0, current = 0;
-                int ret =
+                errno_t ret =
                     audio_mixer_get_item_info(exch, i, &name, &levels);
                 if (ret != EOK) {
@@ -99 +99 @@
         const unsigned item = get_number(argv[params++]);
         const unsigned value = get_number(argv[params]);
-        int ret = audio_mixer_set_item_level(exch, item, value);
+        errno_t ret = audio_mixer_set_item_level(exch, item, value);
         if (ret != EOK) {
                 printf("Failed to set item level: %s.\n", str_error(ret));
@@ -118 +118 @@
         unsigned value = 0;
 
-        int ret = audio_mixer_get_item_level(exch, item, &value);
+        errno_t ret = audio_mixer_get_item_level(exch, item, &value);
         if (ret != EOK) {
                 printf("Failed to get item level: %s.\n", str_error(ret));
@@ -148 +148 @@
 
         service_id_t mixer_sid;
-        int rc = loc_service_get_id(service, &mixer_sid, 0);
+        errno_t rc = loc_service_get_id(service, &mixer_sid, 0);
         if (rc != EOK) {
                 printf("Failed to resolve service '%s': %s.\n",