Changeset 84239b1 in mainline for uspace/lib/hound/src/protocol.c

Timestamp:

2018-03-11T19:39:11Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f3d47c97

Parents:

850fd32

Message:

And there was much fixing.

File:

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

uspace/lib/hound/src/protocol.c

@@ -73 +73 @@
                 uint8_t channels;
                 uint8_t format;
-        } f __attribute__((packed));
+        } __attribute__((packed)) f;
         sysarg_t arg;
 } format_convert_t;
@@ -385 +385 @@
 void hound_connection_handler(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
+        hound_context_id_t id;
+        errno_t ret;
+        int flags;
+        void *source;
+        void *sink;
+
         /* Accept connection if there is a valid iface*/
         if (server_iface) {
@@ -397 +403 @@
                 ipc_callid_t callid = async_get_call(&call);
                 switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_HOUND_CONTEXT_REGISTER: {
+                case IPC_M_HOUND_CONTEXT_REGISTER:
                         /* check interface functions */
                         if (!server_iface || !server_iface->add_context) {
@@ -407 +413 @@
 
                         /* Get context name */
-                        errno_t ret =
-                            async_data_write_accept(&name, true, 0, 0, 0, 0);
+                        ret = async_data_write_accept(&name, true, 0, 0, 0, 0);
                         if (ret != EOK) {
                                 async_answer_0(callid, ret);
                                 break;
                         }
-                        hound_context_id_t id = 0;
+
+                        id = 0;
                         ret = server_iface->add_context(server_iface->server,
                             &id, name, record);
@@ -424 +430 @@
                         }
                         break;
-                }
-                case IPC_M_HOUND_CONTEXT_UNREGISTER: {
+                case IPC_M_HOUND_CONTEXT_UNREGISTER:
                         /* check interface functions */
                         if (!server_iface || !server_iface->rem_context) {
@@ -433 +438 @@
 
                         /* get id, 1st param */
-                        hound_context_id_t id = IPC_GET_ARG1(call);
-                        const errno_t ret =
-                            server_iface->rem_context(server_iface->server, id);
+                        id = IPC_GET_ARG1(call);
+                        ret = server_iface->rem_context(server_iface->server,
+                            id);
                         async_answer_0(callid, ret);
                         break;
-                }
-                case IPC_M_HOUND_GET_LIST: {
+                case IPC_M_HOUND_GET_LIST:
                         /* check interface functions */
                         if (!server_iface || !server_iface->get_list) {
@@ -447 +451 @@
 
                         char **list = NULL;
-                        const int flags = IPC_GET_ARG1(call);
+                        flags = IPC_GET_ARG1(call);
                         size_t count = IPC_GET_ARG2(call);
                         const bool conn = IPC_GET_ARG3(call);
                         char *conn_name = NULL;
-                        errno_t ret = EOK;
+                        ret = EOK;
 
                         /* get connected actor name if provided */
@@ -501 +505 @@
                         free(list);
                         break;
-                }
-                case IPC_M_HOUND_CONNECT: {
+                case IPC_M_HOUND_CONNECT:
                         /* check interface functions */
                         if (!server_iface || !server_iface->connect) {
@@ -509 +512 @@
                         }
 
-                        void *source = NULL;
-                        void *sink = NULL;
+                        source = NULL;
+                        sink = NULL;
 
                         /* read source name */
-                        errno_t ret =
-                            async_data_write_accept(&source, true, 0, 0, 0, 0);
+                        ret = async_data_write_accept(&source, true, 0, 0, 0,
+                            0);
                         /* read sink name */
                         if (ret == EOK)
@@ -527 +530 @@
                         async_answer_0(callid, ret);
                         break;
-                }
-                case IPC_M_HOUND_DISCONNECT: {
+                case IPC_M_HOUND_DISCONNECT:
                         /* check interface functions */
                         if (!server_iface || !server_iface->disconnect) {
@@ -535 +537 @@
                         }
 
-                        void *source = NULL;
-                        void *sink = NULL;
+                        source = NULL;
+                        sink = NULL;
 
                         /* read source name */
-                        errno_t ret =
-                            async_data_write_accept(&source, true, 0, 0, 0, 0);
+                        ret = async_data_write_accept(&source, true, 0, 0, 0,
+                            0);
                         /*read sink name */
                         if (ret == EOK)
@@ -552 +554 @@
                         async_answer_0(callid, ret);
                         break;
-                }
-                case IPC_M_HOUND_STREAM_ENTER: {
+                case IPC_M_HOUND_STREAM_ENTER:
                         /* check interface functions */
                         if (!server_iface || !server_iface->is_record_context
@@ -563 +564 @@
 
                         /* get parameters */
-                        hound_context_id_t id = IPC_GET_ARG1(call);
-                        const int flags = IPC_GET_ARG2(call);
+                        id = IPC_GET_ARG1(call);
+                        flags = IPC_GET_ARG2(call);
                         const format_convert_t c = {.arg = IPC_GET_ARG3(call)};
                         const pcm_format_t f = {
@@ -574 +575 @@
 
                         void *stream;
-                        errno_t ret = server_iface->add_stream(server_iface->server,
+                        ret = server_iface->add_stream(server_iface->server,
                             id, flags, f, bsize, &stream);
                         if (ret != EOK) {
@@ -604 +605 @@
                         }
                         break;
-                }
                 case IPC_M_HOUND_STREAM_EXIT:
                 case IPC_M_HOUND_STREAM_DRAIN: