Changes in uspace/lib/hound/src/protocol.c [84239b1:5a6cc679] in mainline

File:

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

uspace/lib/hound/src/protocol.c

@@ -73 +73 @@
                 uint8_t channels;
                 uint8_t format;
-        } __attribute__((packed)) f;
+        } f __attribute__((packed));
         sysarg_t arg;
 } format_convert_t;
@@ -173 +173 @@
  * @retval Error code.
  */
-errno_t hound_service_get_list(hound_sess_t *sess, 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)
 {
@@ -206 +206 @@
 
         /* Start receiving names */
-        char **names = NULL;
+        const char **names = NULL;
         if (name_count) {
                 size_t *sizes = calloc(name_count, sizeof(size_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) {
@@ -403 +397 @@
                 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) {
@@ -413 +407 @@
 
                         /* Get context name */
-                        ret = async_data_write_accept(&name, true, 0, 0, 0, 0);
+                        errno_t ret =
+                            async_data_write_accept(&name, true, 0, 0, 0, 0);
                         if (ret != EOK) {
                                 async_answer_0(callid, ret);
                                 break;
                         }
-
-                        id = 0;
+                        hound_context_id_t id = 0;
                         ret = server_iface->add_context(server_iface->server,
                             &id, name, record);
@@ -430 +424 @@
                         }
                         break;
-                case IPC_M_HOUND_CONTEXT_UNREGISTER:
+                }
+                case IPC_M_HOUND_CONTEXT_UNREGISTER: {
                         /* check interface functions */
                         if (!server_iface || !server_iface->rem_context) {
@@ -438 +433 @@
 
                         /* get id, 1st param */
-                        id = IPC_GET_ARG1(call);
-                        ret = server_iface->rem_context(server_iface->server,
-                            id);
+                        hound_context_id_t id = IPC_GET_ARG1(call);
+                        const errno_t 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) {
@@ -450 +446 @@
                         }
 
-                        char **list = NULL;
-                        flags = IPC_GET_ARG1(call);
+                        const char **list = NULL;
+                        const int flags = IPC_GET_ARG1(call);
                         size_t count = IPC_GET_ARG2(call);
                         const bool conn = IPC_GET_ARG3(call);
                         char *conn_name = NULL;
-                        ret = EOK;
+                        errno_t ret = EOK;
 
                         /* get connected actor name if provided */
@@ -505 +501 @@
                         free(list);
                         break;
-                case IPC_M_HOUND_CONNECT:
+                }
+                case IPC_M_HOUND_CONNECT: {
                         /* check interface functions */
                         if (!server_iface || !server_iface->connect) {
@@ -512 +509 @@
                         }
 
-                        source = NULL;
-                        sink = NULL;
+                        void *source = NULL;
+                        void *sink = NULL;
 
                         /* read source name */
-                        ret = async_data_write_accept(&source, true, 0, 0, 0,
-                            0);
+                        errno_t ret =
+                            async_data_write_accept(&source, true, 0, 0, 0, 0);
                         /* read sink name */
                         if (ret == EOK)
@@ -530 +527 @@
                         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) {
@@ -537 +535 @@
                         }
 
-                        source = NULL;
-                        sink = NULL;
+                        void *source = NULL;
+                        void *sink = NULL;
 
                         /* read source name */
-                        ret = async_data_write_accept(&source, true, 0, 0, 0,
-                            0);
+                        errno_t ret =
+                            async_data_write_accept(&source, true, 0, 0, 0, 0);
                         /*read sink name */
                         if (ret == EOK)
@@ -554 +552 @@
                         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
@@ -564 +563 @@
 
                         /* get parameters */
-                        id = IPC_GET_ARG1(call);
-                        flags = IPC_GET_ARG2(call);
+                        hound_context_id_t id = IPC_GET_ARG1(call);
+                        const int flags = IPC_GET_ARG2(call);
                         const format_convert_t c = {.arg = IPC_GET_ARG3(call)};
                         const pcm_format_t f = {
@@ -575 +574 @@
 
                         void *stream;
-                        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) {
@@ -605 +604 @@
                         }
                         break;
+                }
                 case IPC_M_HOUND_STREAM_EXIT:
                 case IPC_M_HOUND_STREAM_DRAIN: