Changeset 904b1bc in mainline for uspace/lib/hound/src/protocol.c

Timestamp:

2018-05-22T10:36:58Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a4eb3ba2

Parents:

4f8772d4

git-author:

Jiri Svoboda <jiri@…> (2018-05-21 17:36:30)

git-committer:

Jiri Svoboda <jiri@…> (2018-05-22 10:36:58)

Message:

Fix remaining ccheck issues.

File:

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

uspace/lib/hound/src/protocol.c

@@ -79 +79 @@
 
 
-/****
+/*
  * CLIENT
- ****/
+ */
 
 /** Well defined service name */
@@ -309 +309 @@
     int flags, pcm_format_t format, size_t bsize)
 {
-        const format_convert_t c = { .f = {
-                .channels = format.channels,
-                .rate = format.sampling_rate / 100,
-                .format = format.sample_format,
-        }};
+        const format_convert_t c = {
+                .f = {
+                        .channels = format.channels,
+                        .rate = format.sampling_rate / 100,
+                        .format = format.sample_format,
+                }
+        };
+
         return async_req_4_0(exch, IPC_M_HOUND_STREAM_ENTER, CAP_HANDLE_RAW(id),
             flags, c.arg, bsize);
@@ -362 +365 @@
 }
 
-/****
+/*
  * SERVER
- ****/
+ */
 
 static void hound_server_read_data(void *stream);
@@ -463 +466 @@
                         if (conn)
                                 ret = async_data_write_accept(
-                                    (void**)&conn_name, true, 0, 0, 0, 0);
+                                    (void **)&conn_name, true, 0, 0, 0, 0);
 
                         if (ret == EOK)
@@ -559 +562 @@
                 case IPC_M_HOUND_STREAM_ENTER:
                         /* check interface functions */
-                        if (!server_iface || !server_iface->is_record_context
-                            || !server_iface->add_stream
-                            || !server_iface->rem_stream) {
+                        if (!server_iface || !server_iface->is_record_context ||
+                            !server_iface->add_stream ||
+                            !server_iface->rem_stream) {
                                 async_answer_0(chandle, ENOTSUP);
                                 break;
@@ -569 +572 @@
                         id = (cap_handle_t) IPC_GET_ARG1(call);
                         flags = IPC_GET_ARG2(call);
-                        const format_convert_t c = {.arg = IPC_GET_ARG3(call)};
+                        const format_convert_t c = { .arg = IPC_GET_ARG3(call) };
                         const pcm_format_t f = {
-                            .sampling_rate = c.f.rate * 100,
-                            .channels = c.f.channels,
-                            .sample_format = c.f.format,
+                                .sampling_rate = c.f.rate * 100,
+                                .channels = c.f.channels,
+                                .sample_format = c.f.format,
                         };
                         size_t bsize = IPC_GET_ARG4(call);
@@ -587 +590 @@
                             server_iface->server, id);
                         if (rec) {
-                                if(server_iface->stream_data_read) {
+                                if (server_iface->stream_data_read) {
                                         async_answer_0(chandle, EOK);
                                         /* start answering read calls */
@@ -631 +634 @@
         errno_t ret_answer = EOK;
         /* accept data write or drain */
-        while (async_data_write_receive_call(&chandle, &call, &size)
-            || (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN)) {
+        while (async_data_write_receive_call(&chandle, &call, &size) ||
+            (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN)) {
                 /* check drain first */
                 if (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN) {
@@ -660 +663 @@
                 }
         }
-        const errno_t ret = IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_EXIT
-            ? EOK : EINVAL;
+        const errno_t ret = IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_EXIT ?
+            EOK : EINVAL;
 
         async_answer_0(chandle, ret);
@@ -678 +681 @@
         errno_t ret_answer = EOK;
         /* accept data read and drain */
-        while (async_data_read_receive_call(&chandle, &call, &size)
-            || (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN)) {
+        while (async_data_read_receive_call(&chandle, &call, &size) ||
+            (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN)) {
                 /* drain does not make much sense but it is allowed */
                 if (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN) {
@@ -704 +707 @@
                 }
         }
-        const errno_t ret = IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_EXIT
-            ? EOK : EINVAL;
+        const errno_t ret = IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_EXIT ?
+            EOK : EINVAL;
 
         async_answer_0(chandle, ret);
@@ -711 +714 @@
 
 
-/***
+/*
  * SERVER SIDE
- ***/
+ */
 
 /**