Changes in uspace/srv/audio/hound/hound.c [b7fd2a0:8a637a4] in mainline

File:

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

uspace/srv/audio/hound/hound.c

@@ -110 +110 @@
 }
 
-static errno_t hound_disconnect_internal(hound_t *hound, const char* source_name, const char* sink_name);
+static int hound_disconnect_internal(hound_t *hound, const char* source_name, const char* sink_name);
 
 /**
@@ -162 +162 @@
  * @return Error code.
  */
-errno_t hound_init(hound_t *hound)
+int hound_init(hound_t *hound)
 {
         assert(hound);
@@ -180 +180 @@
  * @return Error code.
  */
-errno_t hound_add_ctx(hound_t *hound, hound_ctx_t *ctx)
+int hound_add_ctx(hound_t *hound, hound_ctx_t *ctx)
 {
         log_info("Trying to add context %p", ctx);
@@ -189 +189 @@
         list_append(&ctx->link, &hound->contexts);
         fibril_mutex_unlock(&hound->list_guard);
-        errno_t ret = EOK;
+        int ret = EOK;
         if (ret == EOK && ctx->source)
                 ret = hound_add_source(hound, ctx->source);
@@ -208 +208 @@
  * @return Error code.
  */
-errno_t hound_remove_ctx(hound_t *hound, hound_ctx_t *ctx)
+int hound_remove_ctx(hound_t *hound, hound_ctx_t *ctx)
 {
         assert(hound);
@@ -254 +254 @@
  * @return Error code.
  */
-errno_t hound_add_device(hound_t *hound, service_id_t id, const char *name)
+int hound_add_device(hound_t *hound, service_id_t id, const char *name)
 {
         log_verbose("Adding device \"%s\", service: %zu", name, id);
@@ -283 +283 @@
         }
 
-        const errno_t ret = audio_device_init(dev, id, name);
+        const int ret = audio_device_init(dev, id, name);
         if (ret != EOK) {
                 log_debug("Failed to initialize new audio device: %s",
@@ -296 +296 @@
         audio_source_t *source = audio_device_get_source(dev);
         if (source) {
-                const errno_t ret = hound_add_source(hound, source);
+                const int ret = hound_add_source(hound, source);
                 if (ret != EOK) {
                         log_debug("Failed to add device source: %s",
@@ -308 +308 @@
         audio_sink_t *sink = audio_device_get_sink(dev);
         if (sink) {
-                const errno_t ret = hound_add_sink(hound, sink);
+                const int ret = hound_add_sink(hound, sink);
                 if (ret != EOK) {
                         log_debug("Failed to add device sink: %s",
@@ -330 +330 @@
  * @return Error code.
  */
-errno_t hound_add_source(hound_t *hound, audio_source_t *source)
+int hound_add_source(hound_t *hound, audio_source_t *source)
 {
         assert(hound);
@@ -354 +354 @@
  * @return Error code.
  */
-errno_t hound_add_sink(hound_t *hound, audio_sink_t *sink)
+int hound_add_sink(hound_t *hound, audio_sink_t *sink)
 {
         assert(hound);
@@ -378 +378 @@
  * @return Error code.
  */
-errno_t hound_remove_source(hound_t *hound, audio_source_t *source)
+int hound_remove_source(hound_t *hound, audio_source_t *source)
 {
         assert(hound);
@@ -395 +395 @@
  * @return Error code.
  */
-errno_t hound_remove_sink(hound_t *hound, audio_sink_t *sink)
+int hound_remove_sink(hound_t *hound, audio_sink_t *sink)
 {
         assert(hound);
@@ -413 +413 @@
  * @return Error code.
  */
-errno_t hound_list_sources(hound_t *hound, const char ***list, size_t *size)
+int hound_list_sources(hound_t *hound, const char ***list, size_t *size)
 {
         assert(hound);
@@ -428 +428 @@
         }
         const char **names = calloc(count, sizeof(char *));
-        errno_t ret = names ? EOK : ENOMEM;
+        int ret = names ? EOK : ENOMEM;
         for (unsigned long i = 0; i < count && ret == EOK; ++i) {
                 link_t *slink = list_nth(&hound->sources, i);
@@ -455 +455 @@
  * @return Error code.
  */
-errno_t hound_list_sinks(hound_t *hound, const char ***list, size_t *size)
+int hound_list_sinks(hound_t *hound, const char ***list, size_t *size)
 {
         assert(hound);
@@ -470 +470 @@
         }
         const char **names = calloc(count, sizeof(char *));
-        errno_t ret = names ? EOK : ENOMEM;
+        int ret = names ? EOK : ENOMEM;
         for (size_t i = 0; i < count && ret == EOK; ++i) {
                 link_t *slink = list_nth(&hound->sinks, i);
@@ -501 +501 @@
  * identifiers with the same index are connected.
  */
-errno_t hound_list_connections(hound_t *hound, const char ***sources,
+int hound_list_connections(hound_t *hound, const char ***sources,
     const char ***sinks, size_t *size)
 {
@@ -516 +516 @@
  * @return Error code.
  */
-errno_t hound_connect(hound_t *hound, const char* source_name, const char* sink_name)
+int hound_connect(hound_t *hound, const char* source_name, const char* sink_name)
 {
         assert(hound);
@@ -555 +555 @@
  * @return Error code.
  */
-errno_t hound_disconnect(hound_t *hound, const char* source_name, const char* sink_name)
-{
-        assert(hound);
-        fibril_mutex_lock(&hound->list_guard);
-        const errno_t ret = hound_disconnect_internal(hound, source_name, sink_name);
+int hound_disconnect(hound_t *hound, const char* source_name, const char* sink_name)
+{
+        assert(hound);
+        fibril_mutex_lock(&hound->list_guard);
+        const int ret = hound_disconnect_internal(hound, source_name, sink_name);
         fibril_mutex_unlock(&hound->list_guard);
         return ret;
@@ -573 +573 @@
  * This function has to be called with the list_guard lock held.
  */
-static errno_t hound_disconnect_internal(hound_t *hound, const char* source_name,
+static int hound_disconnect_internal(hound_t *hound, const char* source_name,
     const char* sink_name)
 {