Changeset 2b3dd78 in mainline for uspace/lib/hound


Ignore:
Timestamp:
2018-01-31T12:02:00Z (8 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

Location:
uspace/lib/hound
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/hound/include/hound/client.h

    ra0a9cc2 r2b3dd78  
    4747typedef struct hound_stream hound_stream_t;
    4848
    49 hound_context_t * hound_context_create_playback(const char *name,
     49hound_context_t *hound_context_create_playback(const char *name,
    5050    pcm_format_t format, size_t bsize);
    51 hound_context_t * hound_context_create_capture(const char *name,
     51hound_context_t *hound_context_create_capture(const char *name,
    5252    pcm_format_t format, size_t bsize);
    5353void hound_context_destroy(hound_context_t *hound);
    … …  
    5757
    5858errno_t hound_context_get_available_targets(hound_context_t *hound,
    59     const char ***names, size_t *count);
     59    char ***names, size_t *count);
    6060errno_t hound_context_get_connected_targets(hound_context_t *hound,
    61     const char ***names, size_t *count);
     61    char ***names, size_t *count);
    6262
    63 errno_t hound_context_connect_target(hound_context_t *hound, const char* target);
    64 errno_t hound_context_disconnect_target(hound_context_t *hound, const char* target);
     63errno_t hound_context_connect_target(hound_context_t *hound, const char *target);
     64errno_t hound_context_disconnect_target(hound_context_t *hound, const char *target);
    6565
    6666hound_stream_t *hound_stream_create(hound_context_t *hound, unsigned flags,

  • uspace/lib/hound/include/hound/protocol.h

    ra0a9cc2 r2b3dd78  
    6565errno_t hound_service_unregister_context(hound_sess_t *sess, hound_context_id_t id);
    6666
    67 errno_t hound_service_get_list(hound_sess_t *sess, const char ***ids, size_t *count,
     67errno_t hound_service_get_list(hound_sess_t *sess, char ***ids, size_t *count,
    6868    int flags, const char *connection);
    6969
    … …  
    7777 */
    7878static inline errno_t hound_service_get_list_all(hound_sess_t *sess,
    79     const char ***ids, size_t *count, int flags)
     79    char ***ids, size_t *count, int flags)
    8080{
    8181        return hound_service_get_list(sess, ids, count, flags, NULL);
    … …  
    106106        bool (*is_record_context)(void *, hound_context_id_t);
    107107        /** Get string identifiers of specified objects */
    108         errno_t (*get_list)(void *, const char ***, size_t *, const char *, int);
     108        errno_t (*get_list)(void *, char ***, size_t *, const char *, int);
    109109        /** Create connection between source and sink */
    110110        errno_t (*connect)(void *, const char *, const char *);

  • uspace/lib/hound/src/client.c

    ra0a9cc2 r2b3dd78  
    7676        hound_sess_t *session;
    7777        /** context name, reported to the daemon */
    78         const char *name;
     78        char *name;
    7979        /** True if the instance is record context */
    8080        bool record;
    … …  
    196196 */
    197197errno_t hound_context_get_available_targets(hound_context_t *hound,
    198     const char ***names, size_t *count)
     198    char ***names, size_t *count)
    199199{
    200200        assert(hound);
    … …  
    213213 */
    214214errno_t hound_context_get_connected_targets(hound_context_t *hound,
    215     const char ***names, size_t *count)
     215    char ***names, size_t *count)
    216216{
    217217        assert(hound);
    … …  
    237237        assert(target);
    238238
    239         const char **tgt = NULL;
     239        char **tgt = NULL;
    240240        size_t count = 1;
    241241        errno_t ret = EOK;

  • uspace/lib/hound/src/protocol.c

    ra0a9cc2 r2b3dd78  
    173173 * @retval Error code.
    174174 */
    175 errno_t hound_service_get_list(hound_sess_t *sess, const char ***ids, size_t *count,
     175errno_t hound_service_get_list(hound_sess_t *sess, char ***ids, size_t *count,
    176176    int flags, const char *connection)
    177177{
    … …  
    206206
    207207        /* Start receiving names */
    208         const char **names = NULL;
     208        char **names = NULL;
    209209        if (name_count) {
    210210                size_t *sizes = calloc(name_count, sizeof(size_t));
    … …  
    446446                        }
    447447
    448                         const char **list = NULL;
     448                        char **list = NULL;
    449449                        const int flags = IPC_GET_ARG1(call);
    450450                        size_t count = IPC_GET_ARG2(call);
Note: See TracChangeset for help on using the changeset viewer.