Changeset 2b3dd78 in mainline for uspace/srv/audio/hound/hound.c


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/audio/hound/hound.c

    ra0a9cc2 r2b3dd78  
    3737#include <assert.h>
    3838#include <stdlib.h>
     39#include <str.h>
    3940
    4041#include "hound.h"
     
    413414 * @return Error code.
    414415 */
    415 errno_t hound_list_sources(hound_t *hound, const char ***list, size_t *size)
     416errno_t hound_list_sources(hound_t *hound, char ***list, size_t *size)
    416417{
    417418        assert(hound);
     
    427428                return EOK;
    428429        }
    429         const char **names = calloc(count, sizeof(char *));
     430        char **names = calloc(count, sizeof(char *));
    430431        errno_t ret = names ? EOK : ENOMEM;
    431432        for (unsigned long i = 0; i < count && ret == EOK; ++i) {
     
    455456 * @return Error code.
    456457 */
    457 errno_t hound_list_sinks(hound_t *hound, const char ***list, size_t *size)
     458errno_t hound_list_sinks(hound_t *hound, char ***list, size_t *size)
    458459{
    459460        assert(hound);
     
    469470                return EOK;
    470471        }
    471         const char **names = calloc(count, sizeof(char *));
     472        char **names = calloc(count, sizeof(char *));
    472473        errno_t ret = names ? EOK : ENOMEM;
    473474        for (size_t i = 0; i < count && ret == EOK; ++i) {
Note: See TracChangeset for help on using the changeset viewer.