Changes in uspace/lib/hound/src/protocol.c [25a179e:b7fd2a0] in mainline

File:

• uspace/lib/hound/src/protocol.c (modified) (34 diffs)

uspace/lib/hound/src/protocol.c

@@ -93 +93 @@
 {
         service_id_t id = 0;
-        const int ret =
+        const errno_t ret =
             loc_service_get_id(service, &id, IPC_FLAG_BLOCKING);
         if (ret != EOK)
@@ -120 +120 @@
  * @return EOK on success, Error code on failure.
  */
-int hound_service_register_context(hound_sess_t *sess,
+errno_t hound_service_register_context(hound_sess_t *sess,
     const char *name, bool record, hound_context_id_t *id)
 {
@@ -129 +129 @@
         aid_t mid =
             async_send_1(exch, IPC_M_HOUND_CONTEXT_REGISTER, record, &call);
-        int ret = mid ? EOK : EPARTY;
+        errno_t ret = mid ? EOK : EPARTY;
 
         if (ret == EOK)
@@ -153 +153 @@
  * @return Error code.
  */
-int hound_service_unregister_context(hound_sess_t *sess, hound_context_id_t id)
+errno_t hound_service_unregister_context(hound_sess_t *sess, hound_context_id_t id)
 {
         assert(sess);
         async_exch_t *exch = async_exchange_begin(sess);
-        const int ret =
+        const errno_t ret =
             async_req_1_0(exch, IPC_M_HOUND_CONTEXT_UNREGISTER, id);
         async_exchange_end(exch);
@@ -173 +173 @@
  * @retval Error code.
  */
-int hound_service_get_list(hound_sess_t *sess, const char ***ids, size_t *count,
+errno_t hound_service_get_list(hound_sess_t *sess, const char ***ids, size_t *count,
     int flags, const char *connection)
 {
@@ -191 +191 @@
             connection != NULL, &res_call);
 
-        int ret = EOK;
+        errno_t ret = EOK;
         if (mid && connection)
                 ret = async_data_write_start(exch, connection,
@@ -247 +247 @@
  * @return Error code.
  */
-int hound_service_connect_source_sink(hound_sess_t *sess, const char *source,
+errno_t hound_service_connect_source_sink(hound_sess_t *sess, const char *source,
     const char *sink)
 {
@@ -259 +259 @@
         ipc_call_t call;
         aid_t id = async_send_0(exch, IPC_M_HOUND_CONNECT, &call);
-        int ret = id ? EOK : EPARTY;
+        errno_t ret = id ? EOK : EPARTY;
         if (ret == EOK)
                 ret = async_data_write_start(exch, source, str_size(source));
@@ -276 +276 @@
  * @return Error code.
  */
-int hound_service_disconnect_source_sink(hound_sess_t *sess, const char *source,
+errno_t hound_service_disconnect_source_sink(hound_sess_t *sess, const char *source,
     const char *sink)
 {
@@ -285 +285 @@
         ipc_call_t call;
         aid_t id = async_send_0(exch, IPC_M_HOUND_DISCONNECT, &call);
-        int ret = id ? EOK : EPARTY;
+        errno_t ret = id ? EOK : EPARTY;
         if (ret == EOK)
                 ret = async_data_write_start(exch, source, str_size(source));
@@ -304 +304 @@
  * @return Error code.
  */
-int hound_service_stream_enter(async_exch_t *exch, hound_context_id_t id,
+errno_t hound_service_stream_enter(async_exch_t *exch, hound_context_id_t id,
     int flags, pcm_format_t format, size_t bsize)
 {
@@ -321 +321 @@
  * @return Error code.
  */
-int hound_service_stream_exit(async_exch_t *exch)
+errno_t hound_service_stream_exit(async_exch_t *exch)
 {
         return async_req_0_0(exch, IPC_M_HOUND_STREAM_EXIT);
@@ -331 +331 @@
  * @return Error code.
  */
-int hound_service_stream_drain(async_exch_t *exch)
+errno_t hound_service_stream_drain(async_exch_t *exch)
 {
         return async_req_0_0(exch, IPC_M_HOUND_STREAM_DRAIN);
@@ -343 +343 @@
  * @return Error code.
  */
-int hound_service_stream_write(async_exch_t *exch, const void *data, size_t size)
+errno_t hound_service_stream_write(async_exch_t *exch, const void *data, size_t size)
 {
         return async_data_write_start(exch, data, size);
@@ -355 +355 @@
  * @return Error code.
  */
-int hound_service_stream_read(async_exch_t *exch, void *data, size_t size)
+errno_t hound_service_stream_read(async_exch_t *exch, void *data, size_t size)
 {
         return async_data_read_start(exch, data, size);
@@ -407 +407 @@
 
                         /* Get context name */
-                        int ret =
+                        errno_t ret =
                             async_data_write_accept(&name, true, 0, 0, 0, 0);
                         if (ret != EOK) {
@@ -434 +434 @@
                         /* get id, 1st param */
                         hound_context_id_t id = IPC_GET_ARG1(call);
-                        const int ret =
+                        const errno_t ret =
                             server_iface->rem_context(server_iface->server, id);
                         async_answer_0(callid, ret);
@@ -451 +451 @@
                         const bool conn = IPC_GET_ARG3(call);
                         char *conn_name = NULL;
-                        int ret = EOK;
+                        errno_t ret = EOK;
 
                         /* get connected actor name if provided */
@@ -513 +513 @@
 
                         /* read source name */
-                        int ret =
+                        errno_t ret =
                             async_data_write_accept(&source, true, 0, 0, 0, 0);
                         /* read sink name */
@@ -539 +539 @@
 
                         /* read source name */
-                        int ret =
+                        errno_t ret =
                             async_data_write_accept(&source, true, 0, 0, 0, 0);
                         /*read sink name */
@@ -574 +574 @@
 
                         void *stream;
-                        int ret = server_iface->add_stream(server_iface->server,
+                        errno_t ret = server_iface->add_stream(server_iface->server,
                             id, flags, f, bsize, &stream);
                         if (ret != EOK) {
@@ -626 +626 @@
         ipc_call_t call;
         size_t size = 0;
-        int ret_answer = EOK;
+        errno_t ret_answer = EOK;
         /* accept data write or drain */
         while (async_data_write_receive_call(&callid, &call, &size)
@@ -632 +632 @@
                 /* check drain first */
                 if (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN) {
-                        int ret = ENOTSUP;
+                        errno_t ret = ENOTSUP;
                         if (server_iface->drain_stream)
                                 ret = server_iface->drain_stream(stream);
@@ -650 +650 @@
                         continue;
                 }
-                const int ret = async_data_write_finalize(callid, buffer, size);
+                const errno_t ret = async_data_write_finalize(callid, buffer, size);
                 if (ret == EOK) {
                         /* push data to stream */
@@ -657 +657 @@
                 }
         }
-        const int ret = IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_EXIT
+        const errno_t ret = IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_EXIT
             ? EOK : EINVAL;
 
@@ -673 +673 @@
         ipc_call_t call;
         size_t size = 0;
-        int ret_answer = EOK;
+        errno_t ret_answer = EOK;
         /* accept data read and drain */
         while (async_data_read_receive_call(&callid, &call, &size)
@@ -679 +679 @@
                 /* drain does not make much sense but it is allowed */
                 if (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN) {
-                        int ret = ENOTSUP;
+                        errno_t ret = ENOTSUP;
                         if (server_iface->drain_stream)
                                 ret = server_iface->drain_stream(stream);
@@ -695 +695 @@
                         continue;
                 }
-                int ret = server_iface->stream_data_read(stream, buffer, size);
+                errno_t ret = server_iface->stream_data_read(stream, buffer, size);
                 if (ret == EOK) {
                         ret_answer =
@@ -701 +701 @@
                 }
         }
-        const int ret = IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_EXIT
+        const errno_t ret = IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_EXIT
             ? EOK : EINVAL;
 
@@ -718 +718 @@
  * @return Error code.
  */
-int hound_server_register(const char *name, service_id_t *id)
+errno_t hound_server_register(const char *name, service_id_t *id)
 {
         if (!name || !id)
                 return EINVAL;
 
-        int ret = loc_server_register(name);
+        errno_t ret = loc_server_register(name);
         if (ret != EOK)
                 return ret;
@@ -744 +744 @@
  * @return Error code.
  */
-int hound_server_set_device_change_callback(dev_change_callback_t cb)
+errno_t hound_server_set_device_change_callback(dev_change_callback_t cb)
 {
         return loc_register_cat_change_cb(cb);
@@ -754 +754 @@
  * @return Error code.
  */
-int hound_server_devices_iterate(device_callback_t callback)
+errno_t hound_server_devices_iterate(device_callback_t callback)
 {
         if (!callback)
@@ -762 +762 @@
 
         if (!resolved) {
-                const int ret = loc_category_get_id("audio-pcm", &cat_id,
+                const errno_t ret = loc_category_get_id("audio-pcm", &cat_id,
                     IPC_FLAG_BLOCKING);
                 if (ret != EOK)
@@ -771 +771 @@
         service_id_t *svcs = NULL;
         size_t count = 0;
-        const int ret = loc_category_get_svcs(cat_id, &svcs, &count);
+        const errno_t ret = loc_category_get_svcs(cat_id, &svcs, &count);
         if (ret != EOK)
                 return ret;