Changes in uspace/lib/hound/src/client.c [33b8d024:cf13b17] in mainline

File:

• uspace/lib/hound/src/client.c (modified) (16 diffs)

uspace/lib/hound/src/client.c

@@ -76 +76 @@
         hound_sess_t *session;
         /** context name, reported to the daemon */
-        char *name;
+        const char *name;
         /** True if the instance is record context */
         bool record;
@@ -123 +123 @@
                         return NULL;
                 }
-                errno_t rc = hound_service_register_context(
-                    new_context->session, new_context->name, record,
-                    &new_context->id);
-                if (rc != EOK) {
+                new_context->id = hound_service_register_context(
+                    new_context->session, new_context->name, record);
+                if (hound_context_id_err(new_context->id) != EOK) {
                         hound_service_disconnect(new_context->session);
                         free(new_context->name);
@@ -195 +194 @@
  * The function will return deice sinks or source based on the context type.
  */
-errno_t hound_context_get_available_targets(hound_context_t *hound,
-    char ***names, size_t *count)
+int hound_context_get_available_targets(hound_context_t *hound,
+    const char ***names, size_t *count)
 {
         assert(hound);
@@ -212 +211 @@
  * @return Error code.
  */
-errno_t hound_context_get_connected_targets(hound_context_t *hound,
-    char ***names, size_t *count)
+int hound_context_get_connected_targets(hound_context_t *hound,
+    const char ***names, size_t *count)
 {
         assert(hound);
@@ -232 +231 @@
  * connect to the first possible target if it is passed this value.
  */
-errno_t hound_context_connect_target(hound_context_t *hound, const char* target)
+int hound_context_connect_target(hound_context_t *hound, const char* target)
 {
         assert(hound);
         assert(target);
 
-        char **tgt = NULL;
+        const char **tgt = NULL;
         size_t count = 1;
-        errno_t ret = EOK;
+        int ret = EOK;
         if (str_cmp(target, HOUND_DEFAULT_TARGET) == 0) {
                 ret = hound_context_get_available_targets(hound, &tgt, &count);
@@ -269 +268 @@
  * @return Error code.
  */
-errno_t hound_context_disconnect_target(hound_context_t *hound, const char* target)
+int hound_context_disconnect_target(hound_context_t *hound, const char* target)
 {
         assert(hound);
@@ -305 +304 @@
                 new_stream->context = hound;
                 new_stream->flags = flags;
-                const errno_t ret = hound_service_stream_enter(new_stream->exch,
+                const int ret = hound_service_stream_enter(new_stream->exch,
                     hound->id, flags, format, bsize);
                 if (ret != EOK) {
@@ -343 +342 @@
  * @return error code.
  */
-errno_t hound_stream_write(hound_stream_t *stream, const void *data, size_t size)
+int hound_stream_write(hound_stream_t *stream, const void *data, size_t size)
 {
         assert(stream);
@@ -358 +357 @@
  * @return error code.
  */
-errno_t hound_stream_read(hound_stream_t *stream, void *data, size_t size)
+int hound_stream_read(hound_stream_t *stream, void *data, size_t size)
 {
         assert(stream);
@@ -371 +370 @@
  * @return Error code.
  */
-errno_t hound_stream_drain(hound_stream_t *stream)
+int hound_stream_drain(hound_stream_t *stream)
 {
         assert(stream);
@@ -402 +401 @@
  * @return error code.
  */
-errno_t hound_write_main_stream(hound_context_t *hound,
+int hound_write_main_stream(hound_context_t *hound,
     const void *data, size_t size)
 {
@@ -422 +421 @@
  * @return error code.
  */
-errno_t hound_read_main_stream(hound_context_t *hound, void *data, size_t size)
+int hound_read_main_stream(hound_context_t *hound, void *data, size_t size)
 {
         assert(hound);
@@ -442 +441 @@
  * NOT IMPLEMENTED
  */
-errno_t hound_write_replace_main_stream(hound_context_t *hound,
+int hound_write_replace_main_stream(hound_context_t *hound,
     const void *data, size_t size)
 {
@@ -460 +459 @@
  * NOT IMPLEMENTED
  */
-errno_t hound_context_set_main_stream_params(hound_context_t *hound,
+int hound_context_set_main_stream_params(hound_context_t *hound,
     pcm_format_t format, size_t bsize)
 {
@@ -479 +478 @@
  * to drain and destroys it before returning.
  */
-errno_t hound_write_immediate(hound_context_t *hound, pcm_format_t format,
+int hound_write_immediate(hound_context_t *hound, pcm_format_t format,
     const void *data, size_t size)
 {
@@ -488 +487 @@
         if (!tmpstream)
                 return ENOMEM;
-        const errno_t ret = hound_stream_write(tmpstream, data, size);
+        const int ret = hound_stream_write(tmpstream, data, size);
         if (ret == EOK) {
                 //TODO drain?