Changeset 2b3dd78 in mainline for uspace/srv/audio/hound/hound.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/srv/audio/hound/hound.c (modified) (5 diffs)

uspace/srv/audio/hound/hound.c

@@ -37 +37 @@
 #include <assert.h>
 #include <stdlib.h>
+#include <str.h>
 
 #include "hound.h"
@@ -413 +414 @@
  * @return Error code.
  */
-errno_t hound_list_sources(hound_t *hound, const char ***list, size_t *size)
+errno_t hound_list_sources(hound_t *hound, char ***list, size_t *size)
 {
         assert(hound);
@@ -427 +428 @@
                 return EOK;
         }
-        const char **names = calloc(count, sizeof(char *));
+        char **names = calloc(count, sizeof(char *));
         errno_t ret = names ? EOK : ENOMEM;
         for (unsigned long i = 0; i < count && ret == EOK; ++i) {
@@ -455 +456 @@
  * @return Error code.
  */
-errno_t hound_list_sinks(hound_t *hound, const char ***list, size_t *size)
+errno_t hound_list_sinks(hound_t *hound, char ***list, size_t *size)
 {
         assert(hound);
@@ -469 +470 @@
                 return EOK;
         }
-        const char **names = calloc(count, sizeof(char *));
+        char **names = calloc(count, sizeof(char *));
         errno_t ret = names ? EOK : ENOMEM;
         for (size_t i = 0; i < count && ret == EOK; ++i) {