Changeset 2b3dd78 in mainline for uspace/app/mixerctl/mixerctl.c

Timestamp:

2018-01-31T12:02:00Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

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

uspace/app/mixerctl/mixerctl.c

@@ -49 +49 @@
 static void print_levels(async_exch_t *exch)
 {
-        const char* name = NULL;
+        char* name = NULL;
         unsigned count = 0;
         errno_t ret = audio_mixer_get_info(exch, &name, &count);
@@ -59 +59 @@
 
         for (unsigned i = 0; i < count; ++i) {
-                const char *name = NULL;
+                char *name = NULL;
                 unsigned levels = 0, current = 0;
                 errno_t ret =