Changeset ff381a7 in mainline for uspace/srv/audio/hound/hound.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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 mainline changes.

File:

• uspace/srv/audio/hound/hound.c (modified) (6 diffs)

uspace/srv/audio/hound/hound.c

@@ -267 +267 @@
                 if (dev->id == id) {
                         log_debug("Device with id %zu is already present", id);
-                        return EEXISTS;
+                        return EEXIST;
                 }
         }
@@ -274 +274 @@
         if (dev) {
                 log_debug("Device with name %s is already present", name);
-                return EEXISTS;
+                return EEXIST;
         }
 
@@ -341 +341 @@
                 log_debug("Source by that name already exists");
                 fibril_mutex_unlock(&hound->list_guard);
-                return EEXISTS;
+                return EEXIST;
         }
         list_append(&source->link, &hound->sources);
@@ -365 +365 @@
                 log_debug("Sink by that name already exists");
                 fibril_mutex_unlock(&hound->list_guard);
-                return EEXISTS;
+                return EEXIST;
         }
         list_append(&sink->link, &hound->sinks);
@@ -420 +420 @@
 
         fibril_mutex_lock(&hound->list_guard);
-        const size_t count = list_count(&hound->sources);
+        const unsigned long count = list_count(&hound->sources);
         if (count == 0) {
                 *list = NULL;
@@ -429 +429 @@
         const char **names = calloc(count, sizeof(char *));
         int ret = names ? EOK : ENOMEM;
-        for (size_t i = 0; i < count && ret == EOK; ++i) {
+        for (unsigned long i = 0; i < count && ret == EOK; ++i) {
                 link_t *slink = list_nth(&hound->sources, i);
                 audio_source_t *source = audio_source_list_instance(slink);